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

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

View File

@@ -464,7 +464,7 @@ public class InstalledAppDetails extends Fragment
showIt = false; showIt = false;
} else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { } else if ((mAppEntry.info.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {
showIt = false; showIt = false;
} else if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) { } else if (mPackageInfo == null || mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
showIt = false; showIt = false;
} else if (UserHandle.myUserId() != 0) { } else if (UserHandle.myUserId() != 0) {
showIt = false; showIt = false;