Commit Graph

103 Commits

Author SHA1 Message Date
Gilles Debunne
a6a8a1479b Split Location and Security settings.
Needs final icon for location.

Change-Id: I8d826203c4d0ca4ae768f59ecdeae2700bad7c86
2011-06-21 16:53:00 -07:00
Brian Carlstrom
d4023b7cca 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
2011-06-01 10:47:42 -07:00
Amith Yamasani
0f85c48d6c Remove / re-word some settings for WiFi-only devices.
Bug: 3468248

1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"

Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
2011-02-24 10:53:29 -08:00
Wink Saville
327147eb06 Have SecuritySettings and SoundSettings use getCurrentPhoneType
To preserve proper behavior now that getPhoneType can return
PHONE_TYPE_NONE use getCurrentPhoneType.

bug: 3198435
Change-Id: I39d385b17d746f3c7cdbc3e1869efa5d4e89230c
2011-02-02 11:30:25 -08:00
Jason parks
f821730407 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
2011-01-27 11:26:58 -06:00
Jason parks
4112199ed6 Display the correct encryption settings.
* You can no longer try to encrypt the device when it is encrypted.
* Moved the encryption section below the lock screen section. It will be more common to change the lock screen settings.
* If the device doesn't support encryption don't display the encryption section.

Bug: 3384074
Change-Id: I172f5894a3cea57b1b8d03a84f1ecf0ee500c1f3
2011-01-25 10:29:50 -06:00
Jason parks
666800a237 Remove unused code.
Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
2011-01-21 13:55:57 -06:00
Jason parks
a13e9c877c Merge "Encrypt inplace settings." into honeycomb 2011-01-20 15:50:55 -08:00
Chia-chi Yeh
91d65a20af Extract credential storage dialogs to a new activity.
Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.

Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d
2011-01-20 19:45:04 +08:00
Jason parks
3e8b76319d Encrypt inplace settings.
Change-Id: I5b9cb94c987dedecf3bf31cb67a42e2f24866d3b
2011-01-18 09:31:51 -06:00
Chia-chi Yeh
7ade84bb9b Remove obsolete code from SecuritySettings.
Change-Id: Ie1d7167ec8e748b86144e12bed72a3ca0dc99da1
2011-01-18 17:09:00 +08:00
Jason parks
6f8fb43617 Add a setting to enable encryption.
This isn't final and it will wipe your device.

Change-Id: I7fecded92a745844435878d0409d620bfa571472
2011-01-13 17:39:20 -06:00
Jim Miller
c9787070ba Fix 3333490,3250193: Update LockScreen settings
This updates LockScreen to conform to the latest UI design.

Change-Id: Ie88a26db7912ddb4331804e347189cc084c481f4
2011-01-10 18:26:20 -08:00
Jim Miller
17e9e19330 Fix 3148496: Initial pass at fragmentizing lockscreen settings.
This converts most of the existing activities to fragments and wraps
them in PreferenceActivities so they can be launched as before
(e.g. by a DevicePolicyManager)

Upload after sync/rebase.

Change-Id: I4f351b75d9fca0498bcb04b4e11ff3b70765a4ba
2010-12-08 16:45:52 -08:00
Jim Miller
36972bb7e9 Fix 3201870: Move OwnerInfo settings to Location&Security.
This moves OwnerInfo into Location&Security and adds the
necessary logic to only show it in modes that make sense-
Lock (when not disabled) and Unlock (pattern, pin, password).

Change-Id: I3549dc4d956406aea3d63cd06d37bcea27a5b555
2010-11-30 20:21:42 -08:00
Amith Yamasani
edac9af662 Conditional remove "haptic" settings if there's no vibrator
Bug: 3193801
2010-11-17 09:08:21 -08:00
Mathew Inwood
f8b25796f0 Add 'Use My Location for Google services'.
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.

Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug: 3093036

Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
2010-10-22 12:24:02 +01:00
Amith Yamasani
02cf71a591 Use PreferenceActivity and FragmentBreadCrumbs as they offer the same capabilities now.
Also fix: 2997438 and a similar bug in Tether Settings
Show + menu item for User Dictionary
2010-09-21 15:48:52 -07:00
Jim Miller
86624a2154 Fix 2579224: Add a separate timeout for lockscreen vs display
This change adds a second timeout to the SecuritySettings page
separate from the standard display timeout.

Change-Id: I033a3578d876148bd723dee5d1a2531be5d6b51d
2010-09-01 19:53:25 -07:00
Amith Yamasani
d79934731c Refactor settings top level activities to use fragments.
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.

Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.

There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
2010-08-18 22:59:33 -07:00
Mike Dodd
5e47f95316 Fix build.
Change-Id: I9982c3b1a7f844af82513012a267f2efb14a5031
2010-07-26 15:16:03 -07:00
Jean-Baptiste Queru
58d70800fd am 885ac770: am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '885ac7701fc809276aed1be151b9ecd8bd0a1cd3'

* commit '885ac7701fc809276aed1be151b9ecd8bd0a1cd3':
  Remove unused imports in SecuritySettings.java
2010-07-26 14:41:52 -07:00
Jean-Baptiste Queru
885ac7701f am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp

* commit '46c0a5b12973fcd40b72b48fe344e45f1110865e':
  Remove unused imports in SecuritySettings.java
2010-07-26 14:37:30 -07:00
Ben Clark
844d2a34a2 Remove unused imports in SecuritySettings.java
Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
2010-07-24 23:06:16 +01:00
Konstantin Lopyrev
57fbf694a5 Change I546ee2fb: Fix 2677197: Adding minimum complex character support.
Change-Id: I5590ec2743b84e34098871507dbcc2f49e5a4e9f
2010-05-27 16:04:49 -07:00
Jim Miller
e587fb670a am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more discoverable." into froyo
Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken

* commit '0b326a6fad8caf250b61cc49b962495202562a5c':
  Fix 2579923: Make changing lock screen method more discoverable.
2010-04-12 13:55:43 -07:00
Jim Miller
bbb4afa19f Fix 2579923: Make changing lock screen method more discoverable.
This changes the organization of lock screen security settings
to make choosing an alternate unlock method more discoverable.

Instead of having to disable the old lock method to use a new
one, the user now just has one set/change option in lock settings,
with a list of method-specific setting below it.

In addition, we ask the user to confirm their old credentials
before prompting them to choose a new one, which eliminates one
source of confusion.

Also, ChooseLockGeneric now shows a UI if quality isn't specified.
Any unlock method less secure than minimum specified by
DevicePolicyManager (if active) is greyed out.

Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
2010-04-11 23:28:33 -07:00
Oscar Montemayor
6f72be68c1 DO NOT MERGE
Removing unused features from source tree.
Please refer to Bug#2502219.

Change-Id: Ib3321f3c0e3edf7dff947917ba9bad0f7da93c89
2010-03-26 18:45:05 -07:00
Jim Miller
af366a3ed6 Fix 2535700: Add support for enforcing password quality
Change-Id: I908b4229d46061f3d450adec72b04276fe10afc1
2010-03-25 18:45:22 -07:00
Dianne Hackborn
4037c7f27c Move DeviceAdmin APIs to android.app.admin. 2010-02-26 23:33:35 -08:00
Oscar Montemayor
c5a73328f1 Temporarily hiding enabling non-working functionality UI option for Froyo early droidfooders.
Tracking issue in bug 2475355 Review Settings app options for non-working functionality.
2010-02-26 14:19:36 -08:00
Jim Miller
9e61b9fe59 Fix 2448345: Fix tactile feedback bug in password/PIN and pattern unlock. 2010-02-18 20:10:49 -08:00
Jim Miller
122b6c85a9 Fix 2332563: Update logic for lockscreen in Settings. 2010-02-11 15:02:11 -08:00
Dan Egnor
3352d10f07 Perform master clear via Intent broadcast, rather than using ICheckinService. 2010-02-11 10:22:18 -08:00
Bjorn Bringert
30e4d96512 Remove USE_LOCATION_FOR_SERVICES from Settings
This has been moved to GoogleSettingsProvider
as part of unbundling.

Part of http://b/issue?id=2383870

Change-Id: Ia8e5725b1749fa95436fade0ea23061eb2ca4822
2010-02-08 21:26:49 +00:00
Dianne Hackborn
33111717d5 Update to follow password mode->quality API change. 2010-01-29 17:07:17 -08:00
Dianne Hackborn
8cecf89cec Update to follow device policy changes. 2010-01-28 11:03:09 -08:00
Dianne Hackborn
abc3dc64cf Start hooking up password device policies
This introduces a new activity for changing the password, which takes
care of launching the correct password activity based on the caller's
request and active policy.  The security settings activity now uses
this, and it implements the API action for launching the password UI.
2010-01-21 13:54:44 -08:00
Jim Miller
47d380f1e6 Fix 2385283: Add DevicePolicyManager calls to LockScreen. 2010-01-20 13:37:14 -08:00
Dianne Hackborn
feff652132 Initial UI for managing device policies.
More to come...  what is here now is very ugly, and completely missing the
confirmation screen for setting a device administrator.
2010-01-16 18:30:05 -08:00
Jim Miller
00d2476d8f Fix 2332563: Add password-lock support to lockscreen 2010-01-11 15:51:59 -08:00
Oscar Montemayor
56e1526114 Encrypted File Systems. Recovery process - adding interface settings to toggle feature.
Created a confirmation dialog before rebooring the device.
2009-12-10 14:56:05 -08:00
Oscar Montemayor
8877f74901 Encrypted File Systems Project. Enabling Settings menu changes to transition to EFS mode.
Menu interface changes only. Does not affect operatio forthe rest of the system.
2009-11-16 17:18:58 -08:00
Chia-chi Yeh
0bc5e275fd SecuritySettings: reduce 1 access to KeyStore and clean up. 2009-10-06 15:46:39 +08:00
Chia-chi Yeh
454a0dbf8f SecuritySettings: revert "minor tuning". 2009-10-02 02:32:54 +08:00
Chia-chi Yeh
f764d20a74 SecuritySettings: fix a the status before handling the intent. 2009-10-02 02:16:08 +08:00
Chia-chi Yeh
844d3db3fe SecuritySettings: set the check box before further processing. 2009-10-02 01:13:36 +08:00
Chia-chi Yeh
446bf8b5bc SecuritySettings: minor tuning. 2009-10-02 01:11:17 +08:00
Chia-chi Yeh
bf07c83d92 SecuritySettings: remove debug messages. 2009-10-02 01:03:50 +08:00
Chia-chi Yeh
a7c5714599 SecuritySettings: remove trailing spaces. 2009-10-02 00:48:32 +08:00