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

Commit 68fe9b54 authored by Jonathan Scott's avatar Jonathan Scott
Browse files

[frameworks/base] Fix issues in PasswordTest 

Test: btest a.d.c.PasswordTest
Bug: 274890916
Change-Id: I196353c3be3a83972e6cb3e5795d7cccd79b6a95
parent b8b16486

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

+3 −3
Original line number Diff line number Diff line
@@ -22186,7 +22186,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            MANAGE_DEVICE_POLICY_INSTALL_UNKNOWN_SOURCES,

            MANAGE_DEVICE_POLICY_USERS,

            MANAGE_DEVICE_POLICY_SAFE_BOOT,

            MANAGE_DEVICE_POLICY_TIME);

            MANAGE_DEVICE_POLICY_TIME,

            MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS);

    private static final List<String> PROFILE_OWNER_OF_ORGANIZATION_OWNED_DEVICE_PERMISSIONS =

            List.of(

                MANAGE_DEVICE_POLICY_ACROSS_USERS,
@@ -22431,8 +22432,6 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCATION,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_LOCK_CREDENTIALS,

                MANAGE_DEVICE_POLICY_ACROSS_USERS_FULL);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MICROPHONE,

                MANAGE_DEVICE_POLICY_ACROSS_USERS);

        CROSS_USER_PERMISSIONS.put(MANAGE_DEVICE_POLICY_MOBILE_NETWORK,
@@ -22587,6 +22586,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
            hasPermissionOnTargetUser = hasPermission(CROSS_USER_PERMISSIONS.get(permission),

                    callerPackageName);

        }















        return hasPermissionOnOwnUser && hasPermissionOnTargetUser;















    }