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

Commit f26cf98f authored by Eric Olsen's avatar Eric Olsen Committed by Android Git Automerger
Browse files

am 71106558: Merge "Add thermal shutdown. If battery temp >= 68C." into froyo

Merge commit '71106558' into froyo-plus-aosp

* commit '71106558':
  Add thermal shutdown.  If battery temp >= 68C.
parents c7418149 71106558
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ class BatteryService extends Binder {
    void systemReady() {
        // check our power situation now that it is safe to display the shutdown dialog.
        shutdownIfNoPower();
        shutdownIfOverTemp();
    }

    private final void shutdownIfNoPower() {
@@ -190,6 +191,17 @@ class BatteryService extends Binder {
        }
    }

    private final void shutdownIfOverTemp() {
        // shut down gracefully if temperature is too high (> 68.0C)
        // wait until the system has booted before attempting to display the shutdown dialog.
        if (mBatteryTemperature > 680 && ActivityManagerNative.isSystemReady()) {
            Intent intent = new Intent(Intent.ACTION_REQUEST_SHUTDOWN);
            intent.putExtra(Intent.EXTRA_KEY_CONFIRM, false);
            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
            mContext.startActivity(intent);
        }
    }

    private native void native_update();

    private synchronized final void update() {
@@ -199,6 +211,7 @@ class BatteryService extends Binder {
        long dischargeDuration = 0;

        shutdownIfNoPower();
        shutdownIfOverTemp();

        mBatteryLevelCritical = mBatteryLevel <= CRITICAL_BATTERY_LEVEL;
        if (mAcOnline) {