Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 185d2d61: Merge "Disable GPS when in device-idle mode." into mnc-dev

Browse Source 
* commit '185d2d61b51cbc5a3668504c5b0b947b13e479f6':
  Disable GPS when in device-idle mode.
This commit is contained in:
Adam Lesinski
2015-05-27 23:31:32 +00:00
committed by Android Git Automerger
parent ad13df83df 185d2d61b5
commit f8b685e8ad
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/location/GpsLocationProvider.java
View File

@@ -454,6 +454,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
updateNetworkState(networkState, info);
} else if (PowerManager.ACTION_POWER_SAVE_MODE_CHANGED.equals(action)
|| PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED.equals(action)
|| Intent.ACTION_SCREEN_OFF.equals(action)
|| Intent.ACTION_SCREEN_ON.equals(action)) {
updateLowPowerMode();
@@ -501,14 +502,14 @@ public class GpsLocationProvider implements LocationProviderInterface {
}
private void updateLowPowerMode() {
final boolean disableGps;
// Disable GPS if we are in device idle mode.
boolean disableGps = mPowerManager.isDeviceIdleMode();
switch (Settings.Secure.getInt(mContext.getContentResolver(), BATTERY_SAVER_GPS_MODE,
BATTERY_SAVER_MODE_DISABLED_WHEN_SCREEN_OFF)) {
case BATTERY_SAVER_MODE_DISABLED_WHEN_SCREEN_OFF:
disableGps = mPowerManager.isPowerSaveMode() && !mPowerManager.isInteractive();
// If we are in battery saver mode and the screen is off, disable GPS.
disableGps |= mPowerManager.isPowerSaveMode() && !mPowerManager.isInteractive();
break;
default:
disableGps = false;
}
if (disableGps != mDisableGps) {
mDisableGps = disableGps;
@@ -2034,6 +2035,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
intentFilter.addAction(ALARM_TIMEOUT);
intentFilter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
intentFilter.addAction(PowerManager.ACTION_POWER_SAVE_MODE_CHANGED);
intentFilter.addAction(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED);
intentFilter.addAction(Intent.ACTION_SCREEN_OFF);
intentFilter.addAction(Intent.ACTION_SCREEN_ON);
intentFilter.addAction(SIM_STATE_CHANGED);