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

Allow setting a Device Owner via ADB on unprovisioned device with preinstalled account

Browse Source 
Some devices come from carriers with a preinstalled account. This
means that we couldn't set a device owner via "adb shell dpm"
commands, while the regular device owner flow worked (as the
latter just checked whether the device was provisioned).

Bug: 18354022
Change-Id: I9a677de9d34d073e218b9179ec4b0f5b4b82adc9
This commit is contained in:
Esteban Talavera
2015-02-24 16:53:52 +00:00
parent d697ceac02
commit 4b7656f183
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4053,16 +4053,18 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {
}
/**
* Device owner can only be set on an unprovisioned device, unless it was initiated by "adb", in
* which case we allow it if no account is associated with the device.
* Device owner can only be set on an unprovisioned device. However, if initiated via "adb",
* we also allow it if no accounts or additional users are present on the device.
*/
private boolean allowedToSetDeviceOwnerOnDevice() {
int callingId = Binder.getCallingUid();
if (callingId == Process.SHELL_UID || callingId == Process.ROOT_UID) {
return AccountManager.get(mContext).getAccounts().length == 0;
} else {
return !hasUserSetupCompleted(UserHandle.USER_OWNER);
if (!hasUserSetupCompleted(UserHandle.USER_OWNER)) {
return true;
}
int callingId = Binder.getCallingUid();
return (callingId == Process.SHELL_UID || callingId == Process.ROOT_UID)
&& mUserManager.getUserCount() == 1
&& AccountManager.get(mContext).getAccounts().length == 0;
}
private void enforceCrossUserPermission(int userHandle) {