Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cf8f19d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: Ib3c2ab64f7e6abad80eb6814cbd508bff6e76393
parents e33a7cb5 075c6b9d

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −3
Original line number Diff line number Diff line
@@ -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);















        }















    }