Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '339a9bbf6d6544b516d6dbbae874d02f3ef7a6a4':
  Use realActivity as indicator for task locking
This commit is contained in:
Benjamin Franz
2015-08-06 19:20:38 +00:00
committed by Android Git Automerger
parent 8695ec34cf 339a9bbf6d
commit dc89dafaa3
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/TaskRecord.java
View File

@@ -786,7 +786,8 @@ final class TaskRecord {
} }
boolean isLockTaskWhitelistedLocked() { boolean isLockTaskWhitelistedLocked() {
if (mCallingPackage == null) { String pkg = (realActivity != null) ? realActivity.getPackageName() : null;
if (pkg == null) {
return false; return false;
} }
String[] packages = mService.mLockTaskPackages.get(userId); String[] packages = mService.mLockTaskPackages.get(userId);
@@ -794,7 +795,7 @@ final class TaskRecord {
return false; return false;
} }
for (int i = packages.length - 1; i >= 0; --i) { for (int i = packages.length - 1; i >= 0; --i) {
if (mCallingPackage.equals(packages[i])) { if (pkg.equals(packages[i])) {
return true; return true;
} }
} }