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

Commit a1416d28 authored by yuemingw's avatar yuemingw Committed by Yueming Wang
Browse files

Rename DISALLOW_CONFIG_LOCATION_MODE to DISALLOW_CONFIG_LOCATION. 

Bug: 72732481
Test: CtsVerifier test already in
Change-Id: I12a0593eba270727808588efc4c42c4e066c9446
parent 7142be56

src/com/android/settings/location/LocationEnabler.java

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ public class LocationEnabler implements LifecycleObserver, OnResume, OnPause { 


        if (admin == null) {

            admin = RestrictedLockUtils.checkIfRestrictionEnforced(

                    mContext, UserManager.DISALLOW_CONFIG_LOCATION_MODE, userId);

                    mContext, UserManager.DISALLOW_CONFIG_LOCATION, userId);

        }

        return admin;

    }

tests/robotests/src/com/android/settings/location/LocationEnablerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ public class LocationEnablerTest { 
        enforcingUsers.add(new UserManager.EnforcingUser(userId,

                UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));

        when(mUserManager.getUserRestrictionSources(

                UserManager.DISALLOW_CONFIG_LOCATION_MODE, UserHandle.of(userId)))

                UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.of(userId)))

                .thenReturn(enforcingUsers);



        assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue();