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

Merge "Don't always transfer device owner status to other users." into mnc-dev

Browse Source
This commit is contained in:
Rubin Xu
2015-07-31 13:11:08 +00:00
committed by Android (Google) Code Review
parent d692fcf115 e2a4a6ff8a
commit 9a81a182df
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1277,11 +1277,13 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
&& !hasUserSetupCompleted(userId);
if (reqPolicy == DeviceAdminInfo.USES_POLICY_DEVICE_OWNER) {
if (ownsDevice || (userId == UserHandle.USER_OWNER && ownsInitialization)) {
if ((userId == UserHandle.USER_OWNER && (ownsDevice || ownsInitialization))
|| (ownsDevice && ownsProfile)) {
return true;
}
} else if (reqPolicy == DeviceAdminInfo.USES_POLICY_PROFILE_OWNER) {
if (ownsDevice || ownsProfile || ownsInitialization) {
if ((userId == UserHandle.USER_OWNER && ownsDevice) || ownsProfile
|| ownsInitialization) {
return true;
}
} else {
@@ -4244,6 +4246,17 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
throw new IllegalArgumentException("Invalid component name " + initializer
+ " for device initializer");
}
boolean isInitializerSystemApp;
try {
isInitializerSystemApp = isSystemApp(AppGlobals.getPackageManager(),
initializer.getPackageName(), Binder.getCallingUserHandle().getIdentifier());
} catch (RemoteException | IllegalArgumentException e) {
isInitializerSystemApp = false;
Slog.e(LOG_TAG, "Fail to check if device initialzer is system app.", e);
}
if (!isInitializerSystemApp) {
throw new IllegalArgumentException("Only system app can be set as device initializer.");
}
synchronized (this) {
enforceCanSetDeviceInitializer(who);