PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DISALLOW_CONFIG_LOCATION_MODE to DISALLOW_CONFIG_LOCATION.

Browse Source 
Bug: 72732481
Test: CtsVerifier test already in
Change-Id: I12a0593eba270727808588efc4c42c4e066c9446
This commit is contained in:
yuemingw
2018-02-01 17:52:50 +00:00
committed by Yueming Wang
parent 7142be5630
commit a1416d2849
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/location/LocationEnabler.java
View File

@@ -169,7 +169,7 @@ public class LocationEnabler implements LifecycleObserver, OnResume, OnPause {
if (admin == null) { if (admin == null) {
admin = RestrictedLockUtils.checkIfRestrictionEnforced( admin = RestrictedLockUtils.checkIfRestrictionEnforced(
mContext, UserManager.DISALLOW_CONFIG_LOCATION_MODE, userId); mContext, UserManager.DISALLOW_CONFIG_LOCATION, userId);
} }
return admin; return admin;
} }

2
tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
View File

@@ -252,7 +252,7 @@ public class LocationEnablerTest {
enforcingUsers.add(new UserManager.EnforcingUser(userId, enforcingUsers.add(new UserManager.EnforcingUser(userId,
UserManager.RESTRICTION_SOURCE_PROFILE_OWNER)); UserManager.RESTRICTION_SOURCE_PROFILE_OWNER));
when(mUserManager.getUserRestrictionSources( when(mUserManager.getUserRestrictionSources(
UserManager.DISALLOW_CONFIG_LOCATION_MODE, UserHandle.of(userId))) UserManager.DISALLOW_CONFIG_LOCATION, UserHandle.of(userId)))
.thenReturn(enforcingUsers); .thenReturn(enforcingUsers);
assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue(); assertThat(mEnabler.getShareLocationEnforcedAdmin(userId) != null).isTrue();