commit 85a71d6a622eef2cc5258e737c305227cebe2e95
author Geoff Mendal <mendal@google.com> Wed Jul 01 15:42:32 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 01 15:42:33 2015 +0000
tree 07be3753332f1e3ebb832fd15b4da9bce64f326d
parent f7806581e582e5921d0eb4caa9751d1aa429bc47
parent f3bcb994303d0dbaf6195057058386a14372ce58

Merge "Import translations. DO NOT MERGE" into mnc-dev

src/com/android/settings/applications/InstalledAppDetails.java

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 842660b..94705d2 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -346,7 +346,7 @@
         mMemoryPreference.setOnPreferenceClickListener(this);
 
         mLaunchPreference = findPreference(KEY_LAUNCH);
-        if (mAppEntry.info != null) {
+        if (mAppEntry != null && mAppEntry.info != null) {
             if ((mAppEntry.info.flags&ApplicationInfo.FLAG_INSTALLED) == 0 ||
                     !mAppEntry.info.enabled) {
                 mLaunchPreference.setEnabled(false);