Added missing permission check to isPackageDeviceAdminOnAnyUser.
Added a check for the MANAGE_USERS permission to PackageManagerService#isPackageDeviceAdminOnAnyUser. To test that the method is still usable: 1) Enable virtual storage via: adb shell sm set-virtual-disk true 2) Follow instructions by clicking on notification to set up virtual storage 3) Go to Settings -> Apps & notifications -> See all X apps 4) Click on any non-system app (example Instagram) 5) Tap Storage and you should see a "Change" button (if not, choose another app) 6) Tap Change and you should see Internal and Virtual storage options listed 7) The above step confirms the method is still usable by Settings Bug: 128599183 Test: SafetyNet logging (steps listed above) Change-Id: I989f1daf52a71f6c778ebd81baa6f1bf83e9a718 Merged-In: I36521fa43daab399e08869647326a7ac32d1e512
This commit is contained in:
@@ -18839,6 +18839,12 @@ public class PackageManagerService extends IPackageManager.Stub
|
|||||||
@Override
|
@Override
|
||||||
public boolean isPackageDeviceAdminOnAnyUser(String packageName) {
|
public boolean isPackageDeviceAdminOnAnyUser(String packageName) {
|
||||||
final int callingUid = Binder.getCallingUid();
|
final int callingUid = Binder.getCallingUid();
|
||||||
|
if (checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid)
|
||||||
|
!= PERMISSION_GRANTED) {
|
||||||
|
EventLog.writeEvent(0x534e4554, "128599183", -1, "");
|
||||||
|
throw new SecurityException(android.Manifest.permission.MANAGE_USERS
|
||||||
|
+ " permission is required to call this API");
|
||||||
|
}
|
||||||
if (getInstantAppPackageName(callingUid) != null
|
if (getInstantAppPackageName(callingUid) != null
|
||||||
&& !isCallerSameApp(packageName, callingUid)) {
|
&& !isCallerSameApp(packageName, callingUid)) {
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user