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

Merge "Store location changer into Settings.Secure"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-25 17:59:24 +00:00
committed by Android (Google) Code Review
parent e902012cbc e6032be851
commit bc65e6eb66
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,8 @@ public class LocationEnabler implements LifecycleObserver, OnResume, OnPause {
} }
return; return;
} }
updateLocationEnabled(mContext, enabled, UserHandle.myUserId()); updateLocationEnabled(mContext, enabled, UserHandle.myUserId(),
Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
refreshLocationMode(); refreshLocationMode();
} }
@@ -142,7 +143,8 @@ public class LocationEnabler implements LifecycleObserver, OnResume, OnPause {
return; return;
} }
updateLocationMode(mContext, currentMode, mode, ActivityManager.getCurrentUser()); updateLocationMode(mContext, currentMode, mode, ActivityManager.getCurrentUser(),
Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
refreshLocationMode(); refreshLocationMode();
} }

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

@@ -179,7 +179,7 @@ public class LocationEnablerTest {
} }
@Test @Test
public void setLocationMode_notRestricted_shouldBroadcastUpdate() { public void setLocationMode_notRestricted_shouldBroadcastUpdateAndSetChanger() {
when(mUserManager.hasUserRestriction(anyString())).thenReturn(false); when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING); Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_BATTERY_SAVING);
@@ -189,6 +189,9 @@ public class LocationEnablerTest {
argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)), argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
eq(UserHandle.of(ActivityManager.getCurrentUser())), eq(UserHandle.of(ActivityManager.getCurrentUser())),
eq(WRITE_SECURE_SETTINGS)); eq(WRITE_SECURE_SETTINGS));
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
.isEqualTo(Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
} }
@Test @Test
@@ -202,7 +205,7 @@ public class LocationEnablerTest {
} }
@Test @Test
public void setLocationEnabled_notRestricted_shouldBroadcastUpdate() { public void setLocationEnabled_notRestricted_shouldBroadcastUpdateAndSetChanger() {
when(mUserManager.hasUserRestriction(anyString())).thenReturn(false); when(mUserManager.hasUserRestriction(anyString())).thenReturn(false);
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF); Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF);
@@ -212,6 +215,9 @@ public class LocationEnablerTest {
argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)), argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
eq(UserHandle.of(ActivityManager.getCurrentUser())), eq(UserHandle.of(ActivityManager.getCurrentUser())),
eq(WRITE_SECURE_SETTINGS)); eq(WRITE_SECURE_SETTINGS));
assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
.isEqualTo(Settings.Secure.LOCATION_CHANGER_SYSTEM_SETTINGS);
} }
@Test @Test