From 40ba793b33538d27bdeaf1ce2bd444572857741d Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Thu, 17 Nov 2016 13:47:25 -0800
Subject: [PATCH] [DAC FIXIT]: Noted that UNINSTALL_SHORTCUT is no longer
 supported.

Per b/25487830, this permission is no longer supported. I don't think
I can remove it from the manifest file, so unless someone has a better
idea, I'm just replacing the existing doc with a comment saying that
it's not supported.

Doc is staged to:
http://go/dac-stage/reference/android/Manifest.permission.html#UNINSTALL_SHORTCUT

bug: 25487830
Change-Id: Ib564fb49536626df6f92bd2b97a11ffec41e9a90
---
 core/res/AndroidManifest.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 430c6b6459a36..2dccf9e29ce1d 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -1799,8 +1799,7 @@
         android:description="@string/permdesc_install_shortcut"
         android:protectionLevel="normal"/>
 
-    <!-- Allows an application to uninstall a shortcut in Launcher.
-         <p>Protection level: normal
+    <!--This permission is no longer supported.
     -->
     <permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
         android:label="@string/permlab_uninstall_shortcut"