diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-10-05 13:53:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-05 13:53:39 -0700 |
| commit | 4a58b1006cec93565a7106c117b2c87248341404 (patch) | |
| tree | 90be711fafc625ce30303c9557c7fb6e828308fe /src | |
| parent | 69621ece97d9f82e7408562f28110f40d872cb24 (diff) | |
| parent | 54b3f501ca4a7ff88ead39247d2277d2efc82bb6 (diff) | |
| download | packages_apps_settings-4a58b1006cec93565a7106c117b2c87248341404.zip packages_apps_settings-4a58b1006cec93565a7106c117b2c87248341404.tar.gz packages_apps_settings-4a58b1006cec93565a7106c117b2c87248341404.tar.bz2 | |
Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/applications/InstalledAppDetails.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java index 7690b7e..1cdb4dc 100644 --- a/src/com/android/settings/applications/InstalledAppDetails.java +++ b/src/com/android/settings/applications/InstalledAppDetails.java @@ -464,7 +464,7 @@ public class InstalledAppDetails extends Fragment showIt = false; } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { showIt = false; - } else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { + } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { showIt = false; } else if (UserHandle.myUserId() != 0) { showIt = false; |