Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 18e7dedf6c

am: 5e3ef6a1ea

Change-Id: I60be094774400df44d79a0291858a0783557831b
This commit is contained in:
Varun Shah
2019-04-09 13:46:55 -07:00
committed by android-build-merger

View File

@@ -19477,6 +19477,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;