From 352c9017658510fcf31d0a905882de611db7eb3b Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 18 Sep 2012 13:26:29 -0700
Subject: [PATCH] Tweaking mechanism for adding keyguard widgets

-> Fix for issue 7173877
-> Fix for issue 7173587

Change-Id: I266cafcf175c98e0c8a8401e11faa5dd2e2fa885

Conflicts:

	src/com/android/settings/SecuritySettings.java
---
 src/com/android/settings/SecuritySettings.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index d896a68b64e..7ffa805a3df 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -455,8 +455,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
             Intent pickIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_PICK);
             // Found in KeyguardHostView.java
             final int KEYGUARD_HOST_ID = 0x4B455947;
-            int appWidgetId = AppWidgetHost.allocateAppWidgetIdForHost(
-                    "com.android.internal.policy.impl.keyguard", KEYGUARD_HOST_ID);
+            int appWidgetId = AppWidgetHost.allocateAppWidgetIdForSystem(KEYGUARD_HOST_ID);
             if (appWidgetId != -1) {
                 pickIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
                 pickIntent.putExtra(AppWidgetManager.EXTRA_CUSTOM_SORT, false);
@@ -597,7 +596,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                         Integer.toString(appWidgetId));
 
             } else {
-                AppWidgetHost.deleteAppWidgetIdForHost(appWidgetId);
+                AppWidgetHost.deleteAppWidgetIdForSystem(appWidgetId);
             }
         }
         createPreferenceHierarchy();