Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '711065587b46ea0279788757c49a273ff796f844' into froyo-plus-aosp

* commit '711065587b46ea0279788757c49a273ff796f844':
  Add thermal shutdown.  If battery temp >= 68C.
This commit is contained in:
Eric Olsen
2010-03-31 10:07:36 -07:00
committed by Android Git Automerger
parent c7418149fa 711065587b
commit f26cf98ffa
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/BatteryService.java
View File

@@ -177,6 +177,7 @@ class BatteryService extends Binder {
void systemReady() { void systemReady() {
// check our power situation now that it is safe to display the shutdown dialog. // check our power situation now that it is safe to display the shutdown dialog.
shutdownIfNoPower(); shutdownIfNoPower();
shutdownIfOverTemp();
} }
private final void shutdownIfNoPower() { 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 native void native_update();
private synchronized final void update() { private synchronized final void update() {
@@ -199,6 +211,7 @@ class BatteryService extends Binder {
long dischargeDuration = 0; long dischargeDuration = 0;
shutdownIfNoPower(); shutdownIfNoPower();
shutdownIfOverTemp();
mBatteryLevelCritical = mBatteryLevel <= CRITICAL_BATTERY_LEVEL; mBatteryLevelCritical = mBatteryLevel <= CRITICAL_BATTERY_LEVEL;
if (mAcOnline) { if (mAcOnline) {