Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5113e386 authored by Nate Myren's avatar Nate Myren Committed by Gerrit Code Review
Browse files

Merge "Fix NullPointerException in PermissionPolicyService#isTaskStartedFromLauncher" into main

parents c73b1097 d021a3f5

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);

        }