commit 556f6135f992dcd5bfbfffe0172627bfbf57d24e
author Adam Cohen <adamcohen@google.com> Wed Jan 15 15:18:08 2014 -0800
committer Adam Cohen <adamcohen@google.com> Wed Jan 15 23:32:46 2014 +0000
tree 0a2242798f91402a0f22dbe2a3b176a79e76fbc1
parent 230cbf831cbbe8aaa6eaff976f755a8adf5e1708

Don't migrate shortcuts for components that no longer exist

Bug 12570791

Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4478e9b..2102a1f 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2709,7 +2709,7 @@
         return widgetsAndShortcuts;
     }
 
-    private boolean isPackageDisabled(PackageManager pm, String packageName) {
+    private static boolean isPackageDisabled(PackageManager pm, String packageName) {
         try {
             PackageInfo pi = pm.getPackageInfo(packageName, 0);
             return !pi.applicationInfo.enabled;
@@ -2718,7 +2718,8 @@
         }
         return false;
     }
-    private boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
+
+    public static boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
         if (cn == null) {
             return false;
         }