diff options
| author | Andrei Kapishnikov <kapishnikov@google.com> | 2015-04-02 15:21:20 -0400 |
|---|---|---|
| committer | Andrei Kapishnikov <kapishnikov@google.com> | 2015-04-21 11:07:09 -0400 |
| commit | 4eb6a36922f5e98fe181c0326cc5721f0e7589ca (patch) | |
| tree | 8f56b25a90c4512c096be5126b8890e90b101a66 /core/res/AndroidManifest.xml | |
| parent | 225d06624a86bdfdd7ced5c9f04b2ac834878727 (diff) | |
| download | frameworks_base-4eb6a36922f5e98fe181c0326cc5721f0e7589ca.zip frameworks_base-4eb6a36922f5e98fe181c0326cc5721f0e7589ca.tar.gz frameworks_base-4eb6a36922f5e98fe181c0326cc5721f0e7589ca.tar.bz2 | |
Introduced DO_NOT_ASK_CREDENTIALS_ON_BOOT flag
A new flag for DPM.resetPassword() method that specifies that the
device should be decrypted without asking for the password or pattern.
Bug 19250601
Related CL in Settings App: https://googleplex-android-review.git.corp.google.com/#/c/670206
Change-Id: I9ca3472dc18e66e618ff772dee16ca4a450e9997
Diffstat (limited to 'core/res/AndroidManifest.xml')
| -rw-r--r-- | core/res/AndroidManifest.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8f4d9a3..1f529ca 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2404,6 +2404,12 @@ android:description="@string/permdesc_bindCarrierConfigService" android:protectionLevel="signature|system" /> + <!-- Allows an application to query whether DO_NOT_ASK_CREDENTIALS_ON_BOOT + flag is set. + @hide --> + <permission android:name="android.permission.QUERY_DO_NOT_ASK_CREDENTIALS_ON_BOOT" + android:protectionLevel="signature" /> + <!-- The system process is explicitly the only one allowed to launch the confirmation UI for full backup/restore --> <uses-permission android:name="android.permission.CONFIRM_FULL_BACKUP"/> |