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

2015-06-15 15:41:36 +00:00
parent 6a7fdbddf7 c1f24abd10
commit 4b8704c9e1
1 changed files with 3 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
+++ b/packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java
@@ -281,7 +281,9 @@ public class ApplicationsState {
                        return null;
                    }
                }
-                entry = getEntryLocked(info);
+                if (info != null) {
+                    entry = getEntryLocked(info);
+                }
            }
            if (DEBUG_LOCKING) Log.v(TAG, "...getEntry releasing lock");
            return entry;