diff options
| -rw-r--r-- | core/java/android/os/Temperature.java | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/os/Temperature.java b/core/java/android/os/Temperature.java index 21aba595bd5e..5499181c3cdb 100644 --- a/core/java/android/os/Temperature.java +++ b/core/java/android/os/Temperature.java @@ -44,7 +44,7 @@ public final class Temperature implements Parcelable { THROTTLING_MODERATE, THROTTLING_SEVERE, THROTTLING_CRITICAL, - THROTTLING_WARNING, + THROTTLING_EMERGENCY, THROTTLING_SHUTDOWN, }) @Retention(RetentionPolicy.SOURCE) @@ -56,7 +56,7 @@ public final class Temperature implements Parcelable { public static final int THROTTLING_MODERATE = ThrottlingSeverity.MODERATE; public static final int THROTTLING_SEVERE = ThrottlingSeverity.SEVERE; public static final int THROTTLING_CRITICAL = ThrottlingSeverity.CRITICAL; - public static final int THROTTLING_WARNING = ThrottlingSeverity.WARNING; + public static final int THROTTLING_EMERGENCY = ThrottlingSeverity.EMERGENCY; public static final int THROTTLING_SHUTDOWN = ThrottlingSeverity.SHUTDOWN; @IntDef(prefix = { "TYPE_" }, value = { diff --git a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java index 5077f9289477..c1963da3b3af 100644 --- a/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java @@ -268,7 +268,7 @@ public class ThermalManagerServiceTest { @Test public void testGetCurrentStatus() throws RemoteException { - int status = Temperature.THROTTLING_WARNING; + int status = Temperature.THROTTLING_EMERGENCY; Temperature newSkin = new Temperature(100, Temperature.TYPE_SKIN, "skin1", status); mFakeHal.mCallback.onValues(newSkin); assertEquals(status, mService.mService.getCurrentThermalStatus()); |