Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 18e7dedf6c am: 5e3ef6a1ea

am: 4ff24d34d3

Change-Id: If9124acbd9d0c7e123d14a80b245121c27b56d37
This commit is contained in:
Varun Shah
2019-04-09 15:17:46 -07:00
committed by android-build-merger

View File

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