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

Merge "Rename ro.device_owner system property" am: 075c6b9db7

Browse Source 
Change-Id: Ib3c2ab64f7e6abad80eb6814cbd508bff6e76393
This commit is contained in:
Automerger Merge Worker
2020-02-19 17:30:07 +00:00
parent e33a7cb5c3 075c6b9db7
commit 3cf8f19dc4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -403,7 +403,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
* System property whose value is either "true" or "false", indicating whether
* device owner is present.
*/
private static final String PROPERTY_DEVICE_OWNER_PRESENT = "ro.device_owner";
private static final String PROPERTY_DEVICE_OWNER_PRESENT = "ro.organization_owned";
private static final int STATUS_BAR_DISABLE_MASK =
StatusBarManager.DISABLE_EXPAND |
@@ -2475,11 +2475,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {
}
if (!mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT, "").isEmpty()) {
Slog.w(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?");
Slog.w(LOG_TAG, "Trying to set ro.organization_owned, but it has already been set?");
} else {
final String value = Boolean.toString(hasDeviceOwner);
mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, value);
Slog.i(LOG_TAG, "Set ro.device_owner property to " + value);
Slog.i(LOG_TAG, "Set ro.organization_owned property to " + value);
}
}