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

Commit 2f79ae98 authored by Michal Karpinski's avatar Michal Karpinski
Browse files

Tuning down wtf to warning for setting ro.device_owner property 

This was logged to often, especially while running CTS hostside tests
and looked too scary to people.

Bug: 27230864
Change-Id: I9e81d9efe87b4aed18aa473be647c560ff9cfa0d
parent cb1b27b6

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -1642,7 +1642,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }

        }





        if (!TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT))) {

        if (!TextUtils.isEmpty(mInjector.systemPropertiesGet(PROPERTY_DEVICE_OWNER_PRESENT))) {

            Slog.wtf(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?");

            Slog.w(LOG_TAG, "Trying to set ro.device_owner, but it has already been set?");

        } else {

        } else {

            if (mOwners.hasDeviceOwner()) {

            if (mOwners.hasDeviceOwner()) {

                mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true");

                mInjector.systemPropertiesSet(PROPERTY_DEVICE_OWNER_PRESENT, "true");