summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kevin Hufnagle <khufnagle@google.com> 2018-06-22 21:58:38 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-06-22 21:58:38 +0000
commitd2aadbfd93699b8cc2c4d62bd526df0a6eaa1356 (patch)
treec4ccaf9db0367c8bb70b5652efc95dbc24ab4450
parent95b7c25a58e51f97cde349e1aef3c1d87c156830 (diff)
parent902fefdcd2028d3cca7ec2fc313face518bcbf76 (diff)
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
-rw-r--r--core/res/AndroidManifest.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 66c497e99776..4e74d5066b6e 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -2238,7 +2238,8 @@
android:description="@string/permdesc_install_shortcut"
android:protectionLevel="normal"/>
- <!--This permission is no longer supported.
+ <!-- <p class="caution"><strong>Don't use this permission in your app.</strong><br>This
+ permission is no longer supported.
-->
<permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
android:label="@string/permlab_uninstall_shortcut"