diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-15 15:41:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-15 15:41:38 +0000 |
| commit | 4b8704c9e1024fa7aba66cce03cde78c7e10ba64 (patch) | |
| tree | d15ea9b34384e5756f9beb7e06bdb09f950ead8c /packages | |
| parent | 6a7fdbddf7f7cec3ce511994b05eaeb94d18da6a (diff) | |
| parent | c1f24abd1098c2585bdb67b5ecb172433fdd2c90 (diff) | |
| download | frameworks_base-4b8704c9e1024fa7aba66cce03cde78c7e10ba64.zip frameworks_base-4b8704c9e1024fa7aba66cce03cde78c7e10ba64.tar.gz frameworks_base-4b8704c9e1024fa7aba66cce03cde78c7e10ba64.tar.bz2 | |
Merge "Don't try to get entries for uninstalled apps." into mnc-dev
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java | 4 |
1 files changed, 3 insertions, 1 deletions
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 @@ 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; |