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

Integrated policy-exempt apps into isLockTaskPermitted().

Browse Source 
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.MixedDeviceOwnerTest#testIsLockTaskPermitted_includesPolicyExemptApps # on phone and automotive

Bug: 181238156
Change-Id: Ic2e9195beba55b3d8e69e437e564ff092c22db61
This commit is contained in:
Felipe Leme
2021-04-07 13:36:39 -07:00
parent 2e13934402
commit 473d4e111c
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
View File

@@ -11698,9 +11698,18 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
@Override
public boolean isLockTaskPermitted(String pkg) {
final int userHandle = mInjector.userHandleGetCallingUserId();
// Check policy-exempt apps first, as it doesn't require the lock
if (listPolicyExemptAppsUnchecked().contains(pkg)) {
if (VERBOSE_LOG) {
Slogf.v(LOG_TAG, "isLockTaskPermitted(%s): returning true for policy-exempt app",
pkg);
}
return true;
}
final int userId = mInjector.userHandleGetCallingUserId();
synchronized (getLockObject()) {
return getUserData(userHandle).mLockTaskPackages.contains(pkg);
return getUserData(userId).mLockTaskPackages.contains(pkg);
}
}