summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yao Chen <yaochen@google.com> 2019-03-28 21:20:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-03-28 21:20:07 +0000
commite48acf1bc8f187cc396c129fefbd60851ab7c3ab (patch)
treed0a694f741be34898ce478d8d6dcca0884f6ad2f
parent0f92de37476e89de1068c6b10984e5043d2f8cf3 (diff)
parent5377bbab7077ba7e35762605e7f9f4241252c980 (diff)
Merge "Fix crash in IncidentCompanionService. Null means *don't* do the check."
-rw-r--r--services/core/java/com/android/server/incident/IncidentCompanionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/incident/IncidentCompanionService.java b/services/core/java/com/android/server/incident/IncidentCompanionService.java
index 55e054b6c8cd..5c69c1dd3930 100644
--- a/services/core/java/com/android/server/incident/IncidentCompanionService.java
+++ b/services/core/java/com/android/server/incident/IncidentCompanionService.java
@@ -300,7 +300,7 @@ public class IncidentCompanionService extends SystemService {
android.Manifest.permission.DUMP, null);
getContext().enforceCallingOrSelfPermission(
android.Manifest.permission.PACKAGE_USAGE_STATS, null);
- if (pkg == null) {
+ if (pkg != null) {
enforceCallerIsSameApp(pkg);
}
}