From e4b77b8bf27e111a6a15c9e4ffe96e986ea810e8 Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Wed, 19 Feb 2020 10:40:07 +0000 Subject: [PATCH] Rename ro.device_owner system property Bug: 148437300 Test: atest FrameworksServicesTests:DevicePolicyManagerTest Change-Id: I3986de71c3f0f737419702799099ac08bfc48139 --- .../server/devicepolicy/DevicePolicyManagerService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 952a64cb2d7c1..cbbb7fff8aea3 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -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); } }