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

Commit 1f149663 authored by Benjamin Franz's avatar Benjamin Franz Committed by Android Git Automerger
Browse files

am f7a2eb5a: am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as... 

am f7a2eb5a: am a17c5bac: am dc89dafa: am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev

* commit 'f7a2eb5a':
  Use realActivity as indicator for task locking
parents 26dbbcc5 f7a2eb5a

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;

            }

        }