History log of /packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
e68f5224e4359aef7f62c94130d5b9b221bee389 23-Jul-2014 Paul Lawrence <paullawrence@google.com> Show correct string when prompting for pattern before encrypting

Bug: 16505763
Change-Id: I05d874be7651f68688d6582236541f418ec6afc2
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
204440427aa198a836d55418060759a1e964abcc 07-Jul-2014 Paul Lawrence <paullawrence@google.com> Don't put credentials in results from externally accessible activities

ConfirmLockPattern and ConfirmLockPassword return an intent that contains the
password, and as such are dangerous. Create internal versions that are locked
down, and don't put this info in the externally accessible versions.

Bug: 13741939
Change-Id: I0df4d1e720b3c33d2c9ca086636dc54f17b19bf0
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
6bfec2d6b197068dd355bd1742179fe3da07136f 10-Jun-2014 Alan Viverette <alanv@google.com> Remove all dialog icons in Settings

BUG: 15474733
Change-Id: I43ab10a3bbcabdac6109abf80266f1c4b52bf6fb
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
d71c31ef946b35f73a0dded0a32c6ad6afc12227 03-Apr-2014 Paul Lawrence <paullawrence@google.com> Allow encryption when keyguard is set to pattern or no protection

Don't block based on keyguard type, and pass type to encryption function.

Circular dependency on
https://googleplex-android-review.git.corp.google.com/#/c/444200/

Bug: 13749169
Change-Id: Ica95713adca9552ae56341ff33badd1d4b748af8
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
263bcc8b732dbb47d3ce63904e0e05191fabbad6 18-Jan-2014 Fabrice Di Meglio <fdimeglio@google.com> Use Drawer in Settings app

- get rid of PreferenceActivity as much as we can and use fragments instead
- add Drawer widget
- add Dashboard high level entry into the Drawer (but this is work in progress and would be done in another CL)
- add bypass of fragment's Header validation when launched from the Drawer but *force* validation if external
call thru an Intent

Be aware that WifiPickerActivity should remain for now a PreferenceActivity. It is used by SetupWizard and should
not trigger running the SettingsActivity's header building code. SetupWizard is a Home during the provisionnig process
and then deactivate itself as a Home but would make the Home header to appear in the Drawer (because momentarily we
would have two Home).

Also, verified that:

- the WiFi settings still work when called from SetupWizard
- when you have multiple Launchers, the Home header will appear in the list of Headers in the Drawer

Change-Id: I407a5e0fdd843ad7615d3d511c416a44e3d97c90
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
8d028a87e97f9420f9db31a6b8aa80859fe393b3 29-Oct-2012 Vikram Aggarwal <viki@google.com> Allow wireless charging during encrypt

Bug: 7426476 Cant Encrypt mako device using Charging pad as charging
source

Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
eefa61ed2e8583f659e868f3057f195d7cb2bb11 13-Aug-2012 Jean-Baptiste Queru <jbq@google.com> Merge "Settings: Use ICS alert drawable"
e7c53b1c9e48c6f997c47a0ca9a2f190ecbbf586 31-May-2012 Björn Lundén <blunden2@gmail.com> Settings: Use ICS alert drawable

Point to the correct holo alert drawable.

Change-Id: Ia15aaa028c8371cb2478baeecd2da31520c43a5d
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
94c05482240f743daa8c8698a241d1d0dfe2404c 11-Nov-2011 Steven Ross <stross@google.com> Allowing FaceUnlock with a PIN fixes 5467194

We need to allow FaceUnlock if the backup lock supports encryption (PIN).
This requires changing the way the minimum encryption quality is enforced
to allow FaceUnlock as long as the backup lock is a PIN, as FaceUnlock
is considered a lower security than the minimum for encrypted drives.
This change adds some complexity to upgradeQualityForEncryption because it's
used in two places: once to grey out selections that aren't sufficient
security level, and second to force the user to use a higher security level.
This still increases the minimum security level,
but makes an exception for FaceUnlock if it's allowed without encryption.

This uses a MutableBoolean to provide a mutable boolean capability.
We could instead write a custom one or use some other type of mutable
boolean if it exists.

In CryptKeeperSettings, using getKeyguardStoredPasswordQuality directly instead
of getActivePasswordQuality is simpler, but this uses a more complex approach
with a minor tweak as jaggies suggested it and it is clear about the
biometric exception being made.

Change-Id: Ia2645d6bd98857c79c6a9be45eda98087bfe517a
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
4548cdf3a9131a8bcb13ce6d98dcf4a2feca9988 24-Jun-2011 Jason parks <jparks@google.com> Check to see if the power source is a valid charger.

This will allow for devices that can be powered
over USB to be encrypted while plugged into USB.

Bug: 4901080
Change-Id: I7eaa2146c1c4e4dfc9724b11a08ff13a16eda117
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
0e88f4dd19a80e9e4d759595439773fb3e1f0c50 03-Jun-2011 Brian Carlstrom <bdc@google.com> Bulletproof CredentialStorage state handling

As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.

src/com/android/settings/CredentialStorage.java

Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.

constant declaration here, since its used by callers of
ChooseLockSettingsHelper.launchConfirmationActivity
src/com/android/settings/ChooseLockSettingsHelper.java

old producer
src/com/android/settings/ConfirmLockPassword.java
new producer (CredentialStorage wants passwords and patterns)
src/com/android/settings/ConfirmLockPattern.java
new consumer
src/com/android/settings/CredentialStorage.java
old consumer
src/com/android/settings/CryptKeeperSettings.java

Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.

src/com/android/settings/ChooseLockSettingsHelper.java

Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
d4023b7cca11e33e84df39dee9e9a737efab47c2 25-May-2011 Brian Carlstrom <bdc@google.com> Integrating keystore with keyguard (Part 4 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: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
95ef5575a2b70d8c018f99b218353c925a70d418 02-Feb-2011 Andy Stadler <stadler@google.com> Prevent NPE in onActivityResult

We're returning here in an unexpected condition; Treat all inputs
as suspect and verify before proceeding.

Bug: 3399579
Change-Id: I389bd0528f8bc721afb5a9c4646a2e23fde77f77
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
171412000a95ce35fd3461afe7bcc5b7f2f210f4 31-Jan-2011 Andy Stadler <stadler@google.com> Final cleanup of "password required" dialog

Bug: 3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
8dbcb888ec5c79b23c408ccbe800ca2264805dc2 31-Jan-2011 Andy Stadler <stadler@google.com> Improvements to enable encryption steps

* Don't crash when user has pattern lock
* Updated text for final confirmation screen
* Show power & battery level warning text
* Updated layout for both confirmation screens (cleaned up margins,
removed hardcoded text sizes, made settings & confirm consistent).
* Added comments for translators to all cryptkeeper strings

Bug: 3383190
Bug: 3383292
Bug: 3405707
Change-Id: I1adcdd963a549eb6541662ff941d245db5563710
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
f8217304073b5cd13823a0602568394be93bf310 26-Jan-2011 Jason parks <jparks@google.com> More work on the Crypt Keeper.

* Use the DPM to determine if we are encrypted.
* Fix misspelling (Comfirm -> Confirm).
* Animate to black when enabling encryption.
* Add holo droid background.
* Change the progress bar to indterminate.
* Display the percentage complete in the status line.
* Fixed bug 3388097. You will no longer have to unplug your device to start encryption. This line is intentionally long. I could make it shorter but I am proving a point: <magic>overflow: auto;</magic>.
* Actually hold onto the wakelock to prvent the device from sleeping.
* Implement onStop() as a orientation change can happen at boot. This will start the activity twice and there will be multiple handlers with messages.

Change-Id: Ia752d106c39e0d81431e856f8f500182e8ec1abd
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
3da38a0771022615ecb568861e489761fe53a05a 21-Jan-2011 Andy Stadler <stadler@google.com> Add start-encryption intent filter to settings

* Add intent-filter for "android.app.action.START_ENCRYPTION"
* Add pseudo-activity to host intent-filter
* Add code to settings page that exits quickly when encryption
is not available or is already started.

This can be tested using ApiDemos -> App -> Device Admin

Bug: 3346770
Change-Id: Ie97459cf9e2a7b09b690bf085e64ef905466e77a
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
39f1e04079976d3d10fdd8e5dd36c833bab8a371 21-Jan-2011 Jason parks <jparks@google.com> More UI tweaks and fixes.

* Actually post the correct message every 5 second for the progress bar.
* Update the text for the settings to a more finalish version.
* Check the battery status before allowing encryption to proceed.
* Display a place holder message if no password is set for the device.

Change-Id: I2734300c9a81467dbd0401427d8b656922ab4819
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java
ec5a45e79cb7161adfabf475342c1e1b25994276 18-Jan-2011 Jason parks <jparks@google.com> More work on the CryptKeeper.

* There is now a 30 seconds delay after 10 failed password attempts.
* The device is factory reset after 30 failed password attempts.
* Implemented the progress UI for inplace encryption.

Change-Id: Ie830b03f9c84a117ee3048086275d6049907fa3c
/packages/apps/Settings/src/com/android/settings/CryptKeeperSettings.java