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

Commit d1208844 authored by Alex Johnston's avatar Alex Johnston Committed by Automerger Merge Worker
Browse files

Merge "DPMS workaround to check the device owner type in PermissionController"... 

Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752



Change-Id: Ib59acd7a3b4b24dc02d7c69d1590cad800be9c22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b089c8aa 2d31bbe7

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

+13 −0
Original line number Diff line number Diff line
@@ -1982,6 +1982,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { 
        synchronized (getLockObject()) {

            mOwners.load();

            setDeviceOwnershipSystemPropertyLocked();

            if (mOwners.hasDeviceOwner()) {

                setGlobalSettingDeviceOwnerType(

                        mOwners.getDeviceOwnerType(mOwners.getDeviceOwnerPackageName()));

            }

        }

    }










@@ -8811,6 +8815,7 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













        deleteTransferOwnershipBundleLocked(userId);















        toggleBackupServiceActive(UserHandle.USER_SYSTEM, true);















        pushUserControlDisabledPackagesLocked(userId);













        setGlobalSettingDeviceOwnerType(DEVICE_OWNER_TYPE_DEFAULT);















    }





























    private void clearApplicationRestrictions(int userId) {










@@ -18377,6 +18382,14 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {













                "Test only admins can only set the device owner type more than once");





























        mOwners.setDeviceOwnerType(packageName, deviceOwnerType, isAdminTestOnly);













        setGlobalSettingDeviceOwnerType(deviceOwnerType);













    }

























    // TODO(b/237065504): Allow mainline modules to get the device owner type. This is a workaround













    // to get the device owner type in PermissionController. See HibernationPolicy.kt.













    private void setGlobalSettingDeviceOwnerType(int deviceOwnerType) {













        mInjector.binderWithCleanCallingIdentity(













                () -> mInjector.settingsGlobalPutInt("device_owner_type", deviceOwnerType));















    }





























    @Override