am 4a58b100: Merge "Avoid NPE when missing PackageInfo." into jb-mr1-dev

* commit '4a58b1006cec93565a7106c117b2c87248341404':
  Avoid NPE when missing PackageInfo.
This commit is contained in:
Jeff Sharkey
2012-10-05 13:55:36 -07:00
committed by Android Git Automerger

View File

@@ -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;