commit 437e60bc761815e5fd2a4c9bd28745e822dbcff9
author Chris Wren <cwren@android.com> Wed May 14 15:05:18 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed May 14 15:05:18 2014 +0000
tree 65659ea5cfb72a29c9dd304bbc754078c2b689bc
parent d12f7f0b4973af7ede4e2f72e001624ef2bcc20b
parent efaf8a3dcde8158f50e5db36a7e81207b9978863

am efaf8a3d: remove work around for bug 14891460. Bug: 14895464

* commit 'efaf8a3dcde8158f50e5db36a7e81207b9978863':
  remove work around for bug 14891460. Bug: 14895464

src/com/android/launcher3/IconCache.java

diff --git a/src/com/android/launcher3/IconCache.java b/src/com/android/launcher3/IconCache.java
index 4d953ff..be02d35 100644
--- a/src/com/android/launcher3/IconCache.java
+++ b/src/com/android/launcher3/IconCache.java
@@ -253,13 +253,6 @@
                     mLauncherApps.resolveActivity(intent, user);
             ComponentName component = intent.getComponent();
 
-            try {
-                launcherActInfo.getComponentName();
-            } catch (NullPointerException e) {
-                // launcherActInfo is invalid: b/14891460
-                launcherActInfo = null;
-            }
-
             // null info means not installed, but if we have a component from the intent then
             // we should still look in the cache for restored app icons.
             if (launcherActInfo == null && component == null) {