diff options
| author | Winson Chung <winsonc@google.com> | 2012-05-06 17:02:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-06 17:02:07 -0700 |
| commit | 3ed802de77e9847b45074f206a4ac310257f894e (patch) | |
| tree | 363fcafb043f13ab556f1f4d2334b3caa3ee6d51 /src | |
| parent | 4a8938fd16740bf7833b446abe05d0d994f166e2 (diff) | |
| parent | 452b4db5ce5206f050733a39fe95acad11617814 (diff) | |
| download | android_packages_apps_Trebuchet-3ed802de77e9847b45074f206a4ac310257f894e.tar.gz android_packages_apps_Trebuchet-3ed802de77e9847b45074f206a4ac310257f894e.tar.bz2 android_packages_apps_Trebuchet-3ed802de77e9847b45074f206a4ac310257f894e.zip | |
Merge "Fixing NPE in LauncherModel (Bug 6449627)" into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 2 | ||||
| -rw-r--r-- | src/com/android/launcher2/Workspace.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index ff4abc6b3..bae4c56fc 100644 --- a/src/com/android/launcher2/LauncherModel.java +++ b/src/com/android/launcher2/LauncherModel.java @@ -1684,7 +1684,7 @@ public class LauncherModel extends BroadcastReceiver { for (ItemInfo i : sWorkspaceItems) { if (i instanceof ShortcutInfo) { ShortcutInfo info = (ShortcutInfo) i; - if (info.intent.getPackage().equals(packageName)) { + if (info.intent.getComponent().getPackageName().equals(packageName)) { infos.add(info); } } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index e946095f7..456224f65 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -3708,7 +3708,7 @@ public class Workspace extends SmoothPagedView for (String intentStr : newApps) { try { Intent intent = Intent.parseUri(intentStr, 0); - if (packageNames.contains(intent.getPackage())) { + if (packageNames.contains(intent.getComponent().getPackageName())) { newApps.remove(intentStr); } } catch (URISyntaxException e) {} |