Commit Graph

34770 Commits

Author SHA1 Message Date
Brian Carlstrom
0137377289 Integrating keystore with keyguard (Part 1 of 4)
Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: Ic141fb5d4b43d12fe62cb1e29c7cbd891b4be35d
2011-06-01 14:29:59 -07:00
Elliott Hughes
11d8ad4c55 Merge "FileOutputStream guarantees to open O_TRUNC (unless you explicitly ask otherwise)." 2011-05-27 17:15:55 -07:00
Mathias Agopian
b62013f6aa 9-axis sensor fusion with Kalman filter
Add support for 9-axis gravity and linear-acceleration sensors
virtual orientation sensor using 9-axis fusion

Change-Id: I6717539373fce781c10e97b6fa59f68a831a592f
2011-05-27 17:04:55 -07:00
Mathias Agopian
bc00846436 Merge "model rotation can now be controlled by the device's sensors" 2011-05-27 17:02:27 -07:00
Mathias Agopian
837f79fed6 Merge "Fix a few issues with sensors reference-counting" 2011-05-27 17:02:02 -07:00
Svetoslav Ganov
1b9a3c88e3 Merge "Refatoring a bit of accessibility code" 2011-05-27 16:40:17 -07:00
Mathias Agopian
b2da2d817b Merge "sensorservice can now be ran standalone" 2011-05-27 16:37:51 -07:00
Gilles Debunne
da5f284279 Merge "Replacement spans correctly measured in TextView" 2011-05-27 16:12:19 -07:00
Fabrice Di Meglio
069cfe93fa Merge "Fix overrides of isLayoutRtl(Drawable dr)" 2011-05-27 15:35:12 -07:00
Adam Powell
fbfa33c2c8 Merge "Fix bug 4399686 - missing menu after returning from fullscreen video playback in browser" 2011-05-27 15:32:44 -07:00
Eric Laurent
2ac9c70ade Merge "New effect library API" 2011-05-27 15:26:25 -07:00
Adam Powell
540e0ff7e2 Merge "Action bar tab layout tweaks." 2011-05-27 13:44:33 -07:00
Romain Guy
f98ae1da4b Merge "Fix issue with drawColor(color, Mode.Clear)" 2011-05-27 11:44:44 -07:00
Jason Sams
c30d9820d0 Merge "Cleaup of rsComponent to remove GL types." 2011-05-27 11:37:45 -07:00
Fabrice Di Meglio
faef25a912 Merge "Add support for Gravity BEFORE and AFTER" 2011-05-27 11:28:43 -07:00
Martijn Coenen
b6cf4efd9a Merge "Fix NdefRecord flags handling." 2011-05-27 10:55:13 -07:00
Amith Yamasani
353b78a84a Merge "Manual merge. Preference activity changes to work on smaller tablet screens and phones." 2011-05-27 10:24:59 -07:00
Romain Guy
da0571898d Merge "Prettify memory dump." 2011-05-27 10:23:09 -07:00
Brian Carlstrom
5c89ff18ab Merge "Tracking merge of dalvik-dev to master" 2011-05-27 10:12:34 -07:00
Tadashi G. Takaoka
b081aa693c Merge "Fix InputType determination of WebTextView" 2011-05-27 09:54:02 -07:00
Gilles Debunne
b4306d2ce8 Merge "EditText notifies the IME when a suggestion is picked." 2011-05-27 09:26:53 -07:00
Adam Powell
485295e39d Merge "Sync holo button bar styles with UX." 2011-05-26 18:56:08 -07:00
Romain Guy
3293e3a5fd Merge "Remove extraneous log." 2011-05-26 18:49:30 -07:00
Romain Guy
f57cd7090b Merge "Fix texture coordinates for sub-bitmap rendering." 2011-05-26 18:40:13 -07:00
Matthew Xie
1124e746dc Merge "Add wide band speech feature flag" 2011-05-26 18:13:08 -07:00
Romain Guy
8bff0cc2e4 Merge "Correctly implement the CLEAR xfermode." 2011-05-26 16:43:26 -07:00
Jason Sams
d9f8e194f8 Merge "Start splitting allocation into hal and core." 2011-05-26 16:37:09 -07:00
Huahui Wu
15c2b60d40 Merge "b/4452171 Dumping video playbacks to files." 2011-05-26 16:31:28 -07:00
Adam Powell
4954369f72 Merge "Fix bug 4487948 - action bar tabs + configuration change = :(" 2011-05-26 15:47:21 -07:00
Eric Fischer
f0d623c3cc Merge "Import revised translations." 2011-05-26 15:37:27 -07:00
James Dong
f6fa21cc97 Merge "Extract embedded cover art (aka poster frame) in mp4 files" 2011-05-26 12:00:51 -07:00
James Dong
128e496b91 am c004a0c9: am 05e13b9e: am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
* commit 'c004a0c925ea2c9c48bbf9670d2ebf96f432c90a':
  Revert "Use pread() to get the decrypted data for container based DRM file."
2011-05-26 11:41:30 -07:00
Jeff Brown
b94d45c30a am a1a56bd0: (-s ours) am 6ef142a0: am b416e241: Fix bug reporting presence of orientation axis. (DO NOT MERGE)
* commit 'a1a56bd0e3d730edab327495acd5d90b10a6f1e4':
  Fix bug reporting presence of orientation axis. (DO NOT MERGE)
2011-05-26 11:41:12 -07:00
Jeff Brown
a7ebdcd69a am 23e620b3: (-s ours) am 53c3d5b1: am 325bd07b: Add tap/drag touchpad gesture. (DO NOT MERGE)
* commit '23e620b32f9c243e124309681b95fe228feb53b8':
  Add tap/drag touchpad gesture. (DO NOT MERGE)
2011-05-26 11:40:46 -07:00
Jeff Brown
0c8be91d1b am 3c2fb024: (-s ours) am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
* commit '3c2fb0242b0ec21101959dfa08aad3162a523634':
  Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
2011-05-26 11:40:20 -07:00
Jeff Brown
3dee7f2651 am 13412d31: (-s ours) am e8dc05aa: am a6dbfdd3: Add a sprite controller. (DO NOT MERGE)
* commit '13412d31650366f41b1f3d9f429cb0a01dd575ef':
  Add a sprite controller. (DO NOT MERGE)
2011-05-26 11:40:14 -07:00
Jeff Brown
3cad67fba8 am fbc67977: (-s ours) am d5358874: am 5ced76a1: Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
* commit 'fbc67977aecfd94e8923e8eca3b859cd431c94b8':
  Coalesce input events that arrive faster than 333Hz. (DO NOT MERGE)
2011-05-26 11:39:57 -07:00
Jeff Brown
dfba89a57f am e79397df: (-s ours) am dd2534c2: am 7157f6fe: Allow batching samples onto the pending motion event. (DO NOT MERGE)
* commit 'e79397df614d2a489906c44df214a4ea5c49c043':
  Allow batching samples onto the pending motion event. (DO NOT MERGE)
2011-05-26 11:39:46 -07:00
Jeff Brown
a5e525810c am da97f16c: (-s ours) am c5c7e047: am d0132e8e: Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
* commit 'da97f16c5d62d96c1b774a73da23bdc3e3e7b794':
  Minor Alt-TAB / Recent Apps Dialog improvements. (DO NOT MERGE)
2011-05-26 11:39:35 -07:00
Jeff Brown
ddb3b41ab2 am b9b9b3e2: (-s ours) am 6f37a7f9: am eea0aa25: Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
* commit 'b9b9b3e271ce33f71797d6795bcccb5d0bcd6292':
  Support primitive ALT-TAB style navigation using Recent Apps. (DO NOT MERGE)
2011-05-26 11:39:29 -07:00
Jeff Brown
db486ebb3c am 14c45e2e: (-s ours) am 16f1d2ca: am 36001a9f: Merge "Support chorded fallback keys. (DO NOT MERGE)" into honeycomb-mr2
* commit '14c45e2ef99bf87848a379879dbf8f4090799307':
  Support chorded fallback keys. (DO NOT MERGE)
2011-05-26 11:39:22 -07:00
Jeff Brown
fbb71d251b am 92693bce: (-s ours) am 32b7bcc8: am c2d200d4: Merge "Fix focused application handle. (DO NOT MERGE)" into honeycomb-mr2
* commit '92693bce936c1cdbfd9e1b81c4eaf1fe9cf5568e':
  Fix focused application handle. (DO NOT MERGE)
2011-05-26 11:39:10 -07:00
Jeff Brown
9bbfc2c412 am 54bd4cae: (-s ours) am 8ea6e641: am 266ea6b0: Merge "Optimize EventHub to process events in big chunks. (DO NOT MERGE)" into honeycomb-mr2
* commit '54bd4caeabc5daddfce56269949daccd8e7bf661':
  Optimize EventHub to process events in big chunks. (DO NOT MERGE)
2011-05-26 11:38:58 -07:00
Jeff Brown
fd8a76b9d1 am 8e5799ed: (-s ours) am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NOT MERGE)" into honeycomb-mr2
* commit '8e5799ed16ab605d8de775e1644f1fa59ff6627e':
  Refactor how timeouts are calculated. (DO NOT MERGE)
2011-05-26 11:38:48 -07:00
Jeff Brown
eed8d87a0d am 7d0fb570: (-s ours) am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability. (DO NOT MERGE)" into honeycomb-mr2
* commit '7d0fb57044576fd4bbaf9683997bab288c3b759c':
  Improve VelocityTracker numerical stability. (DO NOT MERGE)
2011-05-26 11:38:35 -07:00
Jeff Brown
966b5f9055 am 4e3ba25c: (-s ours) am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)" into honeycomb-mr2
* commit '4e3ba25cc718bbc6db0a332c4105debc4b3552d3':
  Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
2011-05-26 11:38:24 -07:00
Scott Main
31c9c2f91e Merge "docs: add accepted values for setting status bar visibility" 2011-05-26 10:29:45 -07:00
Andreas Huber
12673736ec Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams." 2011-05-26 08:52:55 -07:00
Debashish Chatterjee
de335ca8ec Merge "framework/base changes to add new voicemail provider sample." 2011-05-26 07:45:28 -07:00
Daniel Sandler
198b7d0d9e Merge "Framework support for Android Dreams." 2011-05-26 06:01:41 -07:00