diff options
| author | Jason Monk <jmonk@google.com> | 2015-06-15 15:54:25 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 15:54:25 +0000 |
| commit | 0c8fd1a154f356ce95b7d029bcaf051b8cee181c (patch) | |
| tree | 8266b322cfbd08596165efb9d4d3c5bcc1d1e123 /packages/SettingsLib | |
| parent | 8fdeda3d3af44a0fcaa472af171a1dc09d4e0529 (diff) | |
| parent | 4b8704c9e1024fa7aba66cce03cde78c7e10ba64 (diff) | |
| download | frameworks_base-0c8fd1a154f356ce95b7d029bcaf051b8cee181c.zip frameworks_base-0c8fd1a154f356ce95b7d029bcaf051b8cee181c.tar.gz frameworks_base-0c8fd1a154f356ce95b7d029bcaf051b8cee181c.tar.bz2 | |
am 4b8704c9: Merge "Don\'t try to get entries for uninstalled apps." into mnc-dev
* commit '4b8704c9e1024fa7aba66cce03cde78c7e10ba64':
Don't try to get entries for uninstalled apps.
Diffstat (limited to 'packages/SettingsLib')
| -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; |