summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson <chiuwinson@google.com> 2020-09-25 14:32:08 -0700
committer Winson <chiuwinson@google.com> 2020-09-25 14:32:58 -0700
commit6a9ba6f77c37a8fcb0391d433cc6bd41f9585cf4 (patch)
tree401f915bec17ff350cd761d3dc1b09410fc34c3b
parent1f7549e46f492ceae81b779f6aaddab20cdbccc1 (diff)
Fix null check in hasSigningCertificate
Test: manual verification with test app Change-Id: I33752e8a353e8cb075df0fd702a332b182694a5b
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index b451eaf198f8..0cb9568bbca1 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -6214,8 +6214,11 @@ public class PackageManagerService extends IPackageManager.Stub
synchronized (mLock) {
final AndroidPackage p = mPackages.get(packageName);
+ if (p == null) {
+ return false;
+ }
final PackageSetting ps = getPackageSetting(p.getPackageName());
- if (p == null || ps == null) {
+ if (ps == null) {
return false;
}
final int callingUid = Binder.getCallingUid();