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

Commit 339a9bbf authored by Benjamin Franz's avatar Benjamin Franz Committed by Android (Google) Code Review
Browse files

Merge "Use realActivity as indicator for task locking" into mnc-dev

parents 38c0fbda 6fd84cc8

services/core/java/com/android/server/am/TaskRecord.java

+3 −2
Original line number Diff line number Diff line
@@ -786,7 +786,8 @@ final class TaskRecord { 
    }



    boolean isLockTaskWhitelistedLocked() {

        if (mCallingPackage == null) {

        String pkg = (realActivity != null) ? realActivity.getPackageName() : null;

        if (pkg == null) {

            return false;

        }

        String[] packages = mService.mLockTaskPackages.get(userId);
@@ -794,7 +795,7 @@ final class TaskRecord { 
            return false;

        }

        for (int i = packages.length - 1; i >= 0; --i) {

            if (mCallingPackage.equals(packages[i])) {

            if (pkg.equals(packages[i])) {

                return true;

            }

        }