commit 4b8704c9e1024fa7aba66cce03cde78c7e10ba64
author Jason Monk <jmonk@google.com> Mon Jun 15 15:41:36 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 15 15:41:38 2015 +0000
tree d15ea9b34384e5756f9beb7e06bdb09f950ead8c
parent 6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a
parent c1f24abd1098c2585bdb67b5ecb172433fdd2c90

Merge "Don't try to get entries for uninstalled apps." into mnc-dev

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
index 6561512..40d5437 100644
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -281,7 +281,9 @@
                         return null;
                     }
                 }
-                entry = getEntryLocked(info);
+                if (info != null) {
+                    entry = getEntryLocked(info);
+                }
             }
             if (DEBUG_LOCKING) Log.v(TAG, "...getEntry releasing lock");
             return entry;