diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-16 20:38:49 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-02-17 10:29:52 -0800 |
| commit | ef6b22fc04a8d5ab26e13efac8069c097e0da7c9 (patch) | |
| tree | 883f9fde4fdcde9c073ee2b0987c5dd393a00745 /packages/SettingsProvider | |
| parent | 855dd9e074c4dcb9c90deaeff1eb33d6394dd5da (diff) | |
| download | frameworks_base-ef6b22fc04a8d5ab26e13efac8069c097e0da7c9.zip frameworks_base-ef6b22fc04a8d5ab26e13efac8069c097e0da7c9.tar.gz frameworks_base-ef6b22fc04a8d5ab26e13efac8069c097e0da7c9.tar.bz2 | |
Fix issue #2420412: API review: DeviceAdmin API changes
Note in docs that callbacks are on main thread.
Rename to DeviceAdminReceiver?
Document resetPassword is the device's password.
Also hide android.R.attr.neverEncrypt.
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/AndroidManifest.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/packages/SettingsProvider/AndroidManifest.xml b/packages/SettingsProvider/AndroidManifest.xml index c92b9d7..dd0d064 100644 --- a/packages/SettingsProvider/AndroidManifest.xml +++ b/packages/SettingsProvider/AndroidManifest.xml @@ -7,8 +7,9 @@ android:process="system" android:backupAgent="SettingsBackupAgent" android:killAfterRestore="false" - android:icon="@drawable/ic_launcher_settings" - android:neverEncrypt="true"> + android:icon="@drawable/ic_launcher_settings"> + + <!-- todo add: android:neverEncrypt="true" --> <provider android:name="SettingsProvider" android:authorities="settings" android:multiprocess="false" |