diff options
author | Winson Chung <winsonc@google.com> | 2014-02-26 19:58:18 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-02-26 19:58:19 +0000 |
commit | 3de6ea8647882c507aaa8578a9fada88eadd0be9 (patch) | |
tree | 7f4f5508179fc38812c970c535abdd2d7a7beaf6 | |
parent | e8cc0905e0cd083e2fe5aeb5967fb29cbe1bad1b (diff) | |
parent | c66109caf6bdda021c5d24727529587c3cb24da2 (diff) | |
download | android_packages_apps_Trebuchet-3de6ea8647882c507aaa8578a9fada88eadd0be9.tar.gz android_packages_apps_Trebuchet-3de6ea8647882c507aaa8578a9fada88eadd0be9.tar.bz2 android_packages_apps_Trebuchet-3de6ea8647882c507aaa8578a9fada88eadd0be9.zip |
Merge "Updating Read/Write settings permission protectionLevels. (Bug 11372484)" into ub-now-lunchbox
-rw-r--r-- | AndroidManifest.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 36fa4c190..be3a28b1c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -25,7 +25,7 @@ <permission android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="system|signature" /> + android:protectionLevel="signatureOrSystem" /> <permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -47,7 +47,7 @@ <permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" - android:protectionLevel="normal" + android:protectionLevel="signatureOrSystem" android:label="@string/permlab_write_settings" android:description="@string/permdesc_write_settings"/> |