diff options
| author | 2023-11-10 19:35:15 +0000 | |
|---|---|---|
| committer | 2023-11-10 19:35:15 +0000 | |
| commit | 30626e4be76b3b17dd18eee6fc50b5f9818d5ae4 (patch) | |
| tree | d51170c056e6d15fea9f27c4f0ef8a02af960938 | |
| parent | 98e8207b6a7bc29fff27869f1356e0bbe14e4d82 (diff) | |
| parent | 50acc9eebca9cc82a0c966a458902690f8bc5a29 (diff) | |
Merge "Fix NullPointerException in PermissionPolicyService#isTaskStartedFromLauncher" into main am: 5113e3861d am: 50acc9eebc
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815453
Change-Id: Ie3a67cef38045137b277aa690a49d61a4049d6a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/policy/PermissionPolicyService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/policy/PermissionPolicyService.java b/services/core/java/com/android/server/policy/PermissionPolicyService.java index 0e99e7ee1daa..bd9738e43d41 100644 --- a/services/core/java/com/android/server/policy/PermissionPolicyService.java +++ b/services/core/java/com/android/server/policy/PermissionPolicyService.java @@ -1315,7 +1315,8 @@ public final class PermissionPolicyService extends SystemService { } private boolean isTaskStartedFromLauncher(String currPkg, TaskInfo taskInfo) { - return currPkg.equals(taskInfo.baseActivity.getPackageName()) + return taskInfo.baseActivity != null + && currPkg.equals(taskInfo.baseActivity.getPackageName()) && isLauncherIntent(taskInfo.baseIntent); } |