Merge "Renaming gpsMode to locationMode." (319830dc) · Commits · e / os / android_frameworks_base

core/java/android/os/PowerManager.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -566,7 +566,7 @@ public final class PowerManager {
		* @hide
		*/
		@Retention(RetentionPolicy.SOURCE)
		@IntDef({ServiceType.GPS,
		@IntDef({ServiceType.LOCATION,
		ServiceType.VIBRATION,
		ServiceType.ANIMATION,
		ServiceType.FULL_BACKUP,
		@@ -583,7 +583,7 @@ public final class PowerManager {
		})
		public @interface ServiceType {
		int NULL = 0;
		int GPS = 1;
		int LOCATION = 1;
		int VIBRATION = 2;
		int ANIMATION = 3;
		int FULL_BACKUP = 4;
		@@ -1400,11 +1400,11 @@ public final class PowerManager {
		*/
		@LocationPowerSaveMode
		public int getLocationPowerSaveMode() {
		final PowerSaveState powerSaveState = getPowerSaveState(ServiceType.GPS);
		final PowerSaveState powerSaveState = getPowerSaveState(ServiceType.LOCATION);
		if (!powerSaveState.globalBatterySaverEnabled) {
		return LOCATION_MODE_NO_CHANGE;
		}
		return powerSaveState.gpsMode;
		return powerSaveState.locationMode;
		}

		/**

core/java/android/os/PowerSaveState.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ package android.os;
		* Data class for battery saver state. It contains the data
		* <p>
		* 1. Whether battery saver mode is enabled
		* 2. Specific parameters to use in battery saver mode(i.e. screen brightness, gps mode)
		* 2. Specific parameters to use in battery saver mode (i.e. screen brightness, location mode)
		*
		* @hide
		*/
		@@ -35,12 +35,12 @@ public class PowerSaveState implements Parcelable {
		* {@link PowerManager#isPowerSaveMode()}
		*/
		public final boolean globalBatterySaverEnabled;
		public final int gpsMode;
		public final int locationMode;
		public final float brightnessFactor;

		public PowerSaveState(Builder builder) {
		batterySaverEnabled = builder.mBatterySaverEnabled;
		gpsMode = builder.mGpsMode;
		locationMode = builder.mLocationMode;
		brightnessFactor = builder.mBrightnessFactor;
		globalBatterySaverEnabled = builder.mGlobalBatterySaverEnabled;
		}
		@@ -48,7 +48,7 @@ public class PowerSaveState implements Parcelable {
		public PowerSaveState(Parcel in) {
		batterySaverEnabled = in.readByte() != 0;
		globalBatterySaverEnabled = in.readByte() != 0;
		gpsMode = in.readInt();
		locationMode = in.readInt();
		brightnessFactor = in.readFloat();
		}

		@@ -61,14 +61,14 @@ public class PowerSaveState implements Parcelable {
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeByte((byte) (batterySaverEnabled ? 1 : 0));
		dest.writeByte((byte) (globalBatterySaverEnabled ? 1 : 0));
		dest.writeInt(gpsMode);
		dest.writeInt(locationMode);
		dest.writeFloat(brightnessFactor);
		}

		public static final class Builder {
		private boolean mBatterySaverEnabled = false;
		private boolean mGlobalBatterySaverEnabled = false;
		private int mGpsMode = 0;
		private int mLocationMode = 0;
		private float mBrightnessFactor = 0.5f;

		public Builder() {}
		@@ -83,8 +83,8 @@ public class PowerSaveState implements Parcelable {
		return this;
		}

		public Builder setGpsMode(int mode) {
		mGpsMode = mode;
		public Builder setLocationMode(int mode) {
		mLocationMode = mode;
		return this;
		}

services/core/java/com/android/server/location/GnssLocationProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -529,8 +529,8 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		// Disable GPS if we are in device idle mode.
		boolean disableGps = mPowerManager.isDeviceIdleMode();
		final PowerSaveState result =
		mPowerManager.getPowerSaveState(ServiceType.GPS);
		switch (result.gpsMode) {
		mPowerManager.getPowerSaveState(ServiceType.LOCATION);
		switch (result.locationMode) {
		case PowerManager.LOCATION_MODE_GPS_DISABLED_WHEN_SCREEN_OFF:
		// If we are in battery saver mode and the screen is off, disable GPS.
		disableGps \|= result.batterySaverEnabled && !mPowerManager.isInteractive();

services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java

+17 −16

Original line number	Diff line number	Diff line
		@@ -128,7 +128,7 @@ public class BatterySaverPolicy extends ContentObserver {
		new ArrayMap<>(), /* filesForNoninteractive */
		false, /* forceAllAppsStandby */
		false, /* forceBackgroundCheck */
		PowerManager.LOCATION_MODE_NO_CHANGE /* gpsMode */
		PowerManager.LOCATION_MODE_NO_CHANGE /* locationMode */
		);

		private static final Policy DEFAULT_ADAPTIVE_POLICY = OFF_POLICY;
		@@ -152,7 +152,7 @@ public class BatterySaverPolicy extends ContentObserver {
		new ArrayMap<>(), /* filesForNoninteractive */
		true, /* forceAllAppsStandby */
		true, /* forceBackgroundCheck */
		PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF /* gpsMode */
		PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF /* locationMode */
		);

		private final Object mLock;
		@@ -416,7 +416,7 @@ public class BatterySaverPolicy extends ContentObserver {
		if (currPolicy.disableAod) sb.append("o");
		if (currPolicy.enableQuickDoze) sb.append("q");

		sb.append(currPolicy.gpsMode);
		sb.append(currPolicy.locationMode);

		mEventLogKeys = sb.toString();
		}
		@@ -554,12 +554,13 @@ public class BatterySaverPolicy extends ContentObserver {
		public final boolean forceBackgroundCheck;

		/**
		* This is the flag to decide the gps mode in battery saver mode.
		* This is the flag to decide the location mode in battery saver mode. This was
		* previously called gpsMode.
		*
		* @see Settings.Global#BATTERY_SAVER_CONSTANTS
		* @see #KEY_GPS_MODE
		*/
		public final int gpsMode;
		public final int locationMode;

		private final int mHashCode;

		@@ -582,7 +583,7 @@ public class BatterySaverPolicy extends ContentObserver {
		ArrayMap<String, String> filesForNoninteractive,
		boolean forceAllAppsStandby,
		boolean forceBackgroundCheck,
		int gpsMode) {
		int locationMode) {

		this.adjustBrightnessFactor = adjustBrightnessFactor;
		this.advertiseIsEnabled = advertiseIsEnabled;
		@@ -602,7 +603,7 @@ public class BatterySaverPolicy extends ContentObserver {
		this.filesForNoninteractive = filesForNoninteractive;
		this.forceAllAppsStandby = forceAllAppsStandby;
		this.forceBackgroundCheck = forceBackgroundCheck;
		this.gpsMode = gpsMode;
		this.locationMode = locationMode;

		mHashCode = Objects.hash(
		adjustBrightnessFactor,
		@@ -623,7 +624,7 @@ public class BatterySaverPolicy extends ContentObserver {
		filesForNoninteractive,
		forceAllAppsStandby,
		forceBackgroundCheck,
		gpsMode);
		locationMode);
		}

		static Policy fromConfig(BatterySaverPolicyConfig config) {
		@@ -721,7 +722,7 @@ public class BatterySaverPolicy extends ContentObserver {
		defaultPolicy.forceAllAppsStandby);
		boolean forceBackgroundCheck = parser.getBoolean(KEY_FORCE_BACKGROUND_CHECK,
		defaultPolicy.forceBackgroundCheck);
		int gpsMode = parser.getInt(KEY_GPS_MODE, defaultPolicy.gpsMode);
		int locationMode = parser.getInt(KEY_GPS_MODE, defaultPolicy.locationMode);

		return new Policy(
		adjustBrightnessFactor,
		@@ -745,7 +746,7 @@ public class BatterySaverPolicy extends ContentObserver {
		(new CpuFrequencies()).parseString(cpuFreqNoninteractive).toSysFileMap(),
		forceAllAppsStandby,
		forceBackgroundCheck,
		gpsMode
		locationMode
		);
		}

		@@ -770,7 +771,7 @@ public class BatterySaverPolicy extends ContentObserver {
		&& enableQuickDoze == other.enableQuickDoze
		&& forceAllAppsStandby == other.forceAllAppsStandby
		&& forceBackgroundCheck == other.forceBackgroundCheck
		&& gpsMode == other.gpsMode
		&& locationMode == other.locationMode
		&& filesForInteractive.equals(other.filesForInteractive)
		&& filesForNoninteractive.equals(other.filesForNoninteractive);
		}
		@@ -795,11 +796,11 @@ public class BatterySaverPolicy extends ContentObserver {
		final PowerSaveState.Builder builder = new PowerSaveState.Builder()
		.setGlobalBatterySaverEnabled(currPolicy.advertiseIsEnabled);
		switch (type) {
		case ServiceType.GPS:
		case ServiceType.LOCATION:
		boolean isEnabled = currPolicy.advertiseIsEnabled
		\|\| currPolicy.gpsMode != PowerManager.LOCATION_MODE_NO_CHANGE;
		\|\| currPolicy.locationMode != PowerManager.LOCATION_MODE_NO_CHANGE;
		return builder.setBatterySaverEnabled(isEnabled)
		.setGpsMode(currPolicy.gpsMode)
		.setLocationMode(currPolicy.locationMode)
		.build();
		case ServiceType.ANIMATION:
		return builder.setBatterySaverEnabled(currPolicy.disableAnimation)
		@@ -910,7 +911,7 @@ public class BatterySaverPolicy extends ContentObserver {

		public int getGpsMode() {
		synchronized (mLock) {
		return getCurrentPolicyLocked().gpsMode;
		return getCurrentPolicyLocked().locationMode;
		}
		}

		@@ -995,7 +996,7 @@ public class BatterySaverPolicy extends ContentObserver {
		pw.print(indent);
		pw.println(" " + KEY_ADJUST_BRIGHTNESS_FACTOR + "=" + p.adjustBrightnessFactor);
		pw.print(indent);
		pw.println(" " + KEY_GPS_MODE + "=" + p.gpsMode);
		pw.println(" " + KEY_GPS_MODE + "=" + p.locationMode);
		pw.print(indent);
		pw.println(" " + KEY_FORCE_ALL_APPS_STANDBY + "=" + p.forceAllAppsStandby);
		pw.print(indent);

services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -166,12 +166,12 @@ public class BatterySaverPolicyTest extends AndroidTestCase {

		@SmallTest
		public void testGetBatterySaverPolicy_PolicyGps_DefaultValueCorrect() {
		testServiceDefaultValue_On(ServiceType.GPS);
		testServiceDefaultValue_On(ServiceType.LOCATION);

		mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_FULL);
		PowerSaveState stateOn =
		mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.GPS);
		assertThat(stateOn.gpsMode).isEqualTo(DEFAULT_GPS_MODE);
		mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.LOCATION);
		assertThat(stateOn.locationMode).isEqualTo(DEFAULT_GPS_MODE);
		}

		@SmallTest
		@@ -222,9 +222,9 @@ public class BatterySaverPolicyTest extends AndroidTestCase {
		assertThat(dataSaverState.batterySaverEnabled).isTrue();

		final PowerSaveState gpsState =
		mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.GPS);
		mBatterySaverPolicy.getBatterySaverPolicy(ServiceType.LOCATION);
		assertThat(gpsState.batterySaverEnabled).isTrue();
		assertThat(gpsState.gpsMode).isEqualTo(GPS_MODE);
		assertThat(gpsState.locationMode).isEqualTo(GPS_MODE);

		final PowerSaveState quickDozeState = mBatterySaverPolicy.getBatterySaverPolicy(
		ServiceType.QUICK_DOZE);