Commit 03881285 authored Nov 10, 2023 by Nate Myren Committed by Automerger Merge Worker Nov 10, 2023

Merge "Fix NullPointerException in...

Merge "Fix NullPointerException in PermissionPolicyService#isTaskStartedFromLauncher" into main am: 5113e386

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2815453

Change-Id: Ic13438e1083853c63c597b672b28e39abde9022e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/policy/PermissionPolicyService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}