From d8f7a7190d5a4dcf8b6b47ab698f01c2768506e9 Mon Sep 17 00:00:00 2001
From: Jorge Ruesga <jorge@ruesga.com>
Date: Mon, 13 Jan 2014 00:46:45 +0100
Subject: trebuchet: Fix shortcut install/uninstall permission name

AOSP 4.4 has a public INSTALL_SHORTCUT/UNINSTALL_SHORTCUT permission.

Change-Id: I11cf09b4964838b2366ec37646392ff61be6c529
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
---
 AndroidManifest.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ca26d95fd..ae126920c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -29,18 +29,6 @@
         android:name="com.android.launcher3.permission.PRELOAD_WORKSPACE"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
         android:protectionLevel="system|signature" />
-    <permission
-        android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous"
-        android:label="@string/permlab_install_shortcut"
-        android:description="@string/permdesc_install_shortcut" />
-    <permission
-        android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
-        android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
-        android:protectionLevel="dangerous"
-        android:label="@string/permlab_uninstall_shortcut"
-        android:description="@string/permdesc_uninstall_shortcut"/>
     <permission
         android:name="com.android.launcher3.permission.READ_SETTINGS"
         android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
@@ -178,7 +166,7 @@
             android:name="com.android.launcher3.InstallShortcutReceiver"
             android:permission="com.android.launcher3.permission.INSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher3.action.INSTALL_SHORTCUT" />
+                <action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
@@ -187,7 +175,7 @@
             android:name="com.android.launcher3.UninstallShortcutReceiver"
             android:permission="com.android.launcher3.permission.UNINSTALL_SHORTCUT">
             <intent-filter>
-                <action android:name="com.android.launcher3.action.UNINSTALL_SHORTCUT" />
+                <action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
             </intent-filter>
         </receiver>
 
-- 
cgit v1.2.3