diff options
14 files changed, 44 insertions, 41 deletions
diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index 7f4dee6ef2da..01b6535bf171 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -513,6 +513,34 @@ public final class PowerManager { */ public static final int SHUTDOWN_REASON_BATTERY_THERMAL = 6; + /** + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ServiceType.GPS, + ServiceType.VIBRATION, + ServiceType.ANIMATION, + ServiceType.FULL_BACKUP, + ServiceType.KEYVALUE_BACKUP, + ServiceType.NETWORK_FIREWALL, + ServiceType.SCREEN_BRIGHTNESS, + ServiceType.SOUND, + ServiceType.BATTERY_STATS, + ServiceType.DATA_SAVER}) + public @interface ServiceType { + int NULL = 0; + int GPS = 1; + int VIBRATION = 2; + int ANIMATION = 3; + int FULL_BACKUP = 4; + int KEYVALUE_BACKUP = 5; + int NETWORK_FIREWALL = 6; + int SCREEN_BRIGHTNESS = 7; + int SOUND = 8; + int BATTERY_STATS = 9; + int DATA_SAVER = 10; + } + final Context mContext; final IPowerManager mService; final Handler mHandler; @@ -1055,15 +1083,14 @@ public final class PowerManager { /** * Get data about the battery saver mode for a specific service - * @param serviceType unique key for the service, one of - * {@link com.android.server.power.BatterySaverPolicy.ServiceType} + * @param serviceType unique key for the service, one of {@link ServiceType} * @return Battery saver state data. * * @hide * @see com.android.server.power.BatterySaverPolicy * @see PowerSaveState */ - public PowerSaveState getPowerSaveState(int serviceType) { + public PowerSaveState getPowerSaveState(@ServiceType int serviceType) { try { return mService.getPowerSaveState(serviceType); } catch (RemoteException e) { diff --git a/core/java/android/os/PowerSaveState.java b/core/java/android/os/PowerSaveState.java index 7058a1dca34d..de1128dfdef5 100644 --- a/core/java/android/os/PowerSaveState.java +++ b/core/java/android/os/PowerSaveState.java @@ -27,7 +27,7 @@ public class PowerSaveState implements Parcelable { /** * Whether we should enable battery saver for this service. * - * @see com.android.server.power.BatterySaverPolicy.ServiceType + * @see com.android.server.power.BatterySaverPolicy */ public final boolean batterySaverEnabled; /** diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 622b84239711..e92a56477579 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -80,6 +80,7 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.Signature; import android.database.ContentObserver; import android.net.Uri; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.Binder; import android.os.Build; @@ -126,7 +127,6 @@ import com.android.server.EventLogTags; import com.android.server.SystemConfig; import com.android.server.SystemService; import com.android.server.backup.PackageManagerBackupAgent.Metadata; -import com.android.server.power.BatterySaverPolicy.ServiceType; import libcore.io.IoUtils; diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index 20f236908112..a45a4f0c35d3 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -71,6 +71,7 @@ import android.os.IBinder; import android.os.Message; import android.os.ParcelFileDescriptor; import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.Process; import android.os.RemoteException; @@ -120,7 +121,6 @@ import com.android.server.backup.utils.AppBackupUtils; import com.android.server.backup.utils.BackupManagerMonitorUtils; import com.android.server.backup.utils.BackupObserverUtils; import com.android.server.backup.utils.SparseArrayUtils; -import com.android.server.power.BatterySaverPolicy.ServiceType; import com.google.android.collect.Sets; diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java index 8b79b9ddfef2..0e51fda0f39f 100644 --- a/services/core/java/com/android/server/VibratorService.java +++ b/services/core/java/com/android/server/VibratorService.java @@ -27,6 +27,7 @@ import android.database.ContentObserver; import android.hardware.input.InputManager; import android.hardware.vibrator.V1_0.Constants.EffectStrength; import android.media.AudioManager; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.BatteryStats; import android.os.Handler; @@ -56,7 +57,6 @@ import android.media.AudioAttributes; import com.android.internal.app.IAppOpsService; import com.android.internal.app.IBatteryStats; import com.android.internal.util.DumpUtils; -import com.android.server.power.BatterySaverPolicy.ServiceType; import java.io.FileDescriptor; import java.io.PrintWriter; diff --git a/services/core/java/com/android/server/am/BatteryStatsService.java b/services/core/java/com/android/server/am/BatteryStatsService.java index 52f97020b5a7..a035bd026fea 100644 --- a/services/core/java/com/android/server/am/BatteryStatsService.java +++ b/services/core/java/com/android/server/am/BatteryStatsService.java @@ -21,6 +21,7 @@ import android.content.Context; import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; import android.net.wifi.WifiActivityEnergyInfo; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.BatteryStats; import android.os.BatteryStatsInternal; @@ -53,7 +54,6 @@ import com.android.internal.os.PowerProfile; import com.android.internal.os.RpmStats; import com.android.internal.util.DumpUtils; import com.android.server.LocalServices; -import com.android.server.power.BatterySaverPolicy.ServiceType; import android.util.StatsLog; import java.io.File; diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java index 660659fdfa5c..beb7486d7bc2 100644 --- a/services/core/java/com/android/server/location/GnssLocationProvider.java +++ b/services/core/java/com/android/server/location/GnssLocationProvider.java @@ -48,6 +48,7 @@ import android.net.NetworkInfo; import android.net.NetworkRequest; import android.net.Uri; import android.os.AsyncTask; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.BatteryStats; import android.os.Binder; @@ -84,7 +85,6 @@ import com.android.internal.location.ProviderProperties; import com.android.internal.location.ProviderRequest; import com.android.server.power.BatterySaverPolicy; -import com.android.server.power.BatterySaverPolicy.ServiceType; import libcore.io.IoUtils; diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index b4056b333fe5..551cb10ffc03 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -142,6 +142,7 @@ import android.os.Message; import android.os.MessageQueue.IdleHandler; import android.os.PersistableBundle; import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.os.PowerManagerInternal; import android.os.PowerSaveState; import android.os.Process; @@ -192,7 +193,6 @@ import com.android.server.EventLogTags; import com.android.server.LocalServices; import com.android.server.ServiceThread; import com.android.server.SystemConfig; -import com.android.server.power.BatterySaverPolicy.ServiceType; import libcore.io.IoUtils; diff --git a/services/core/java/com/android/server/power/BatterySaverPolicy.java b/services/core/java/com/android/server/power/BatterySaverPolicy.java index 1781d8c657c3..273b945d4597 100644 --- a/services/core/java/com/android/server/power/BatterySaverPolicy.java +++ b/services/core/java/com/android/server/power/BatterySaverPolicy.java @@ -20,6 +20,8 @@ import android.content.ContentResolver; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; +import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.provider.Settings; import android.util.KeyValueListParser; import android.util.Slog; @@ -34,31 +36,6 @@ import java.lang.annotation.RetentionPolicy; * Class to decide whether to turn on battery saver mode for specific service */ public class BatterySaverPolicy extends ContentObserver { - @Retention(RetentionPolicy.SOURCE) - @IntDef({ServiceType.GPS, - ServiceType.VIBRATION, - ServiceType.ANIMATION, - ServiceType.FULL_BACKUP, - ServiceType.KEYVALUE_BACKUP, - ServiceType.NETWORK_FIREWALL, - ServiceType.SCREEN_BRIGHTNESS, - ServiceType.SOUND, - ServiceType.BATTERY_STATS, - ServiceType.DATA_SAVER}) - public @interface ServiceType { - int NULL = 0; - int GPS = 1; - int VIBRATION = 2; - int ANIMATION = 3; - int FULL_BACKUP = 4; - int KEYVALUE_BACKUP = 5; - int NETWORK_FIREWALL = 6; - int SCREEN_BRIGHTNESS = 7; - int SOUND = 8; - int BATTERY_STATS = 9; - int DATA_SAVER = 10; - } - private static final String TAG = "BatterySaverPolicy"; // Value of batterySaverGpsMode such that GPS isn't affected by battery saver mode. diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 2494bded1b86..8f23cf829366 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -43,6 +43,7 @@ import android.os.IPowerManager; import android.os.Looper; import android.os.Message; import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.os.PowerManagerInternal; import android.os.PowerSaveState; import android.os.Process; @@ -89,7 +90,6 @@ import com.android.server.Watchdog; import com.android.server.am.BatteryStatsService; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; -import com.android.server.power.BatterySaverPolicy.ServiceType; import java.io.BufferedReader; import java.io.File; import java.io.FileReader; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index bf5f4bc83e6c..b28bb719188c 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -158,6 +158,7 @@ import android.os.Message; import android.os.Parcel; import android.os.ParcelFileDescriptor; import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.os.PowerManagerInternal; import android.os.PowerSaveState; import android.os.RemoteException; @@ -243,7 +244,6 @@ import com.android.server.LocalServices; import com.android.server.UiThread; import com.android.server.Watchdog; import com.android.server.input.InputManagerService; -import com.android.server.power.BatterySaverPolicy.ServiceType; import com.android.server.power.ShutdownThread; import com.android.server.utils.PriorityDump; diff --git a/services/tests/servicestests/src/com/android/server/power/BatterySaverPolicyTest.java b/services/tests/servicestests/src/com/android/server/power/BatterySaverPolicyTest.java index 69589e7d1f66..50ac41cdf417 100644 --- a/services/tests/servicestests/src/com/android/server/power/BatterySaverPolicyTest.java +++ b/services/tests/servicestests/src/com/android/server/power/BatterySaverPolicyTest.java @@ -15,13 +15,12 @@ */ package com.android.server.power; +import android.os.PowerManager.ServiceType; import android.os.PowerSaveState; import android.os.Handler; import android.test.AndroidTestCase; import android.test.suitebuilder.annotation.SmallTest; -import com.android.server.power.BatterySaverPolicy.ServiceType; - import org.mockito.Mock; import org.mockito.MockitoAnnotations; diff --git a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java index 4559660351b0..b60d5bf90766 100644 --- a/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/PowerManagerServiceTest.java @@ -66,7 +66,7 @@ public class PowerManagerServiceTest extends AndroidTestCase { .setBrightnessFactor(BRIGHTNESS_FACTOR) .build(); when(mBatterySaverPolicy.getBatterySaverPolicy( - eq(BatterySaverPolicy.ServiceType.SCREEN_BRIGHTNESS), anyBoolean())) + eq(PowerManager.ServiceType.SCREEN_BRIGHTNESS), anyBoolean())) .thenReturn(mPowerSaveState); mDisplayPowerRequest = new DisplayPowerRequest(); mService = new PowerManagerService(getContext(), mBatterySaverPolicy); diff --git a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java index f53eb15d482b..25c54b3e51eb 100644 --- a/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java +++ b/services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerHelper.java @@ -36,12 +36,12 @@ import android.hardware.soundtrigger.SoundTrigger.SoundModelEvent; import android.hardware.soundtrigger.SoundTriggerModule; import android.os.DeadObjectException; import android.os.PowerManager; +import android.os.PowerManager.ServiceType; import android.os.RemoteException; import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Slog; import com.android.internal.logging.MetricsLogger; -import com.android.server.power.BatterySaverPolicy.ServiceType; import java.io.FileDescriptor; import java.io.PrintWriter; |