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

Add missing check in getKeyguardDisabledFeature

Browse Source 
Add check that if admin package is specified, it belong to the calling
admin.

Bug: 193663287
Test: atest com.android.cts.devicepolicy.MixedDeviceOwnerTest
      #testSetKeyguardDisabledFeatures
      atest com.android.cts.devicepolicy.MixedProfileOwnerTest
      #testSetKeyguardDisabledFeatures
      atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest
      #testSetKeyguardDisabledFeatures
      atest ManagedProfileTest#testDevicePolicyManagerParentSupport

Change-Id: I107d8705e3a65707ae5744e7705a4d32629c3c14
Merged-In: I107d8705e3a65707ae5744e7705a4d32629c3c14
(cherry picked from commit 826f893513)
This commit is contained in:
Ayush Sharma
2021-08-23 21:36:12 +00:00
parent 7af338bd58
commit 4820ef1033
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8246,6 +8246,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
final CallerIdentity caller = getCallerIdentity();
Preconditions.checkCallAuthorization(hasFullCrossUsersPermission(caller, userHandle));
Preconditions.checkCallAuthorization(
who == null || isCallingFromPackage(who.getPackageName(), caller.getUid())
|| isSystemUid(caller));
final long ident = mInjector.binderClearCallingIdentity();
try {