summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher3/LauncherModel.java
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2014-01-15 15:18:08 -0800
committerAdam Cohen <adamcohen@google.com>2014-01-15 23:32:46 +0000
commit556f6135f992dcd5bfbfffe0172627bfbf57d24e (patch)
tree0a2242798f91402a0f22dbe2a3b176a79e76fbc1 /src/com/android/launcher3/LauncherModel.java
parent230cbf831cbbe8aaa6eaff976f755a8adf5e1708 (diff)
downloadandroid_packages_apps_Trebuchet-556f6135f992dcd5bfbfffe0172627bfbf57d24e.tar.gz
android_packages_apps_Trebuchet-556f6135f992dcd5bfbfffe0172627bfbf57d24e.tar.bz2
android_packages_apps_Trebuchet-556f6135f992dcd5bfbfffe0172627bfbf57d24e.zip
Don't migrate shortcuts for components that no longer exist
Bug 12570791 Change-Id: Ie4b55afcee0c4d1d16acf7b830d7885800943454
Diffstat (limited to 'src/com/android/launcher3/LauncherModel.java')
-rw-r--r--src/com/android/launcher3/LauncherModel.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index 4478e9bbd..2102a1fac 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -2709,7 +2709,7 @@ public class LauncherModel extends BroadcastReceiver {
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 @@ public class LauncherModel extends BroadcastReceiver {
}
return false;
}
- private boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
+
+ public static boolean isValidPackageComponent(PackageManager pm, ComponentName cn) {
if (cn == null) {
return false;
}