commit a17c5bac6efff8365c1f2019311778413598e37c
author Benjamin Franz <bfranz@google.com> Thu Aug 06 19:28:29 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 19:28:29 2015 +0000
tree 9db36462cbe17c78764512e8095b15a558f41dc3
parent cee6655097d174f25fa21b6c2e80a3bbe54aae7e
parent dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5

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

* commit 'dc89dafaa3d95fe88eaa82b888098ffe9f07e4f5':
  Use realActivity as indicator for task locking

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

diff --git a/services/core/java/com/android/server/am/TaskRecord.java b/services/core/java/com/android/server/am/TaskRecord.java
index 7e2ad29..9da30bf 100644
--- a/services/core/java/com/android/server/am/TaskRecord.java
+++ b/services/core/java/com/android/server/am/TaskRecord.java
@@ -786,7 +786,8 @@
     }
 
     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 @@
             return false;
         }
         for (int i = packages.length - 1; i >= 0; --i) {
-            if (mCallingPackage.equals(packages[i])) {
+            if (pkg.equals(packages[i])) {
                 return true;
             }
         }