Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c2b6766 authored by Wei Wang's avatar Wei Wang Committed by Android (Google) Code Review
Browse files

Merge "Thermal: change WARNING level to EMERGENCY"

parents c2824bd2 ed2c9020

core/java/android/os/Temperature.java

+2 −2
Original line number Diff line number Diff line
@@ -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 = {

services/tests/servicestests/src/com/android/server/power/ThermalManagerServiceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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());