summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/java/android/app/ActivityThread.java13
-rw-r--r--core/java/android/app/IActivityController.aidl5
-rw-r--r--core/java/android/os/BatteryStats.java24
-rw-r--r--core/java/com/android/internal/os/BatteryStatsImpl.java78
4 files changed, 87 insertions, 33 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 3c7bebf..6d1bf96 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -60,6 +60,7 @@ import android.util.Config;
import android.util.DisplayMetrics;
import android.util.EventLog;
import android.util.Log;
+import android.util.LogPrinter;
import android.util.Slog;
import android.view.Display;
import android.view.View;
@@ -118,6 +119,7 @@ public final class ActivityThread {
private static final android.graphics.Bitmap.Config THUMBNAIL_FORMAT = Bitmap.Config.RGB_565;
private static final boolean DEBUG = false;
static final boolean localLOGV = DEBUG ? Config.LOGD : Config.LOGV;
+ static final boolean DEBUG_MESSAGES = false;
static final boolean DEBUG_BROADCAST = false;
private static final boolean DEBUG_RESULTS = false;
private static final boolean DEBUG_BACKUP = false;
@@ -874,7 +876,7 @@ public final class ActivityThread {
public static final int DISPATCH_PACKAGE_BROADCAST = 133;
public static final int SCHEDULE_CRASH = 134;
String codeToString(int code) {
- if (localLOGV) {
+ if (DEBUG_MESSAGES) {
switch (code) {
case LAUNCH_ACTIVITY: return "LAUNCH_ACTIVITY";
case PAUSE_ACTIVITY: return "PAUSE_ACTIVITY";
@@ -916,6 +918,7 @@ public final class ActivityThread {
return "(unknown)";
}
public void handleMessage(Message msg) {
+ if (DEBUG_MESSAGES) Slog.v(TAG, ">>> handling: " + msg.what);
switch (msg.what) {
case LAUNCH_ACTIVITY: {
ActivityClientRecord r = (ActivityClientRecord)msg.obj;
@@ -1037,6 +1040,7 @@ public final class ActivityThread {
case SCHEDULE_CRASH:
throw new RemoteServiceException((String)msg.obj);
}
+ if (DEBUG_MESSAGES) Slog.v(TAG, "<<< done: " + msg.what);
}
void maybeSnapshot() {
@@ -1484,7 +1488,7 @@ public final class ActivityThread {
private final void queueOrSendMessage(int what, Object obj, int arg1, int arg2) {
synchronized (this) {
- if (localLOGV) Slog.v(
+ if (DEBUG_MESSAGES) Slog.v(
TAG, "SCHEDULE " + what + " " + mH.codeToString(what)
+ ": " + arg1 + " / " + obj);
Message msg = Message.obtain();
@@ -3608,6 +3612,11 @@ public final class ActivityThread {
ActivityThread thread = new ActivityThread();
thread.attach(false);
+ if (false) {
+ Looper.myLooper().setMessageLogging(new
+ LogPrinter(Log.DEBUG, "ActivityThread"));
+ }
+
Looper.loop();
if (Process.supportsProcesses()) {
diff --git a/core/java/android/app/IActivityController.aidl b/core/java/android/app/IActivityController.aidl
index c76a517..aca8305 100644
--- a/core/java/android/app/IActivityController.aidl
+++ b/core/java/android/app/IActivityController.aidl
@@ -48,6 +48,11 @@ interface IActivityController
long timeMillis, String stackTrace);
/**
+ * Early call as soon as an ANR is detected.
+ */
+ int appEarlyNotResponding(String processName, int pid, String annotation);
+
+ /**
* An application process is not responding. Return 0 to show the "app
* not responding" dialog, 1 to continue waiting, or -1 to kill it
* immediately.
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java
index ba8014f..d49c8be 100644
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -301,7 +301,11 @@ public abstract class BatteryStats implements Parcelable {
*/
public static abstract class Proc {
- public static class ExcessiveWake {
+ public static class ExcessivePower {
+ public static final int TYPE_WAKE = 1;
+ public static final int TYPE_CPU = 2;
+
+ public int type;
public long overTime;
public long usedTime;
}
@@ -343,9 +347,9 @@ public abstract class BatteryStats implements Parcelable {
*/
public abstract long getTimeAtCpuSpeedStep(int speedStep, int which);
- public abstract int countExcessiveWakes();
+ public abstract int countExcessivePowers();
- public abstract ExcessiveWake getExcessiveWake(int i);
+ public abstract ExcessivePower getExcessivePower(int i);
}
/**
@@ -1593,7 +1597,7 @@ public abstract class BatteryStats implements Parcelable {
systemTime = ps.getSystemTime(which);
starts = ps.getStarts(which);
numExcessive = which == STATS_SINCE_CHARGED
- ? ps.countExcessiveWakes() : 0;
+ ? ps.countExcessivePowers() : 0;
if (userTime != 0 || systemTime != 0 || starts != 0
|| numExcessive != 0) {
@@ -1609,9 +1613,17 @@ public abstract class BatteryStats implements Parcelable {
}
pw.println(sb.toString());
for (int e=0; e<numExcessive; e++) {
- Uid.Proc.ExcessiveWake ew = ps.getExcessiveWake(e);
+ Uid.Proc.ExcessivePower ew = ps.getExcessivePower(e);
if (ew != null) {
- pw.print(prefix); pw.print(" * Killed for wake lock use: ");
+ pw.print(prefix); pw.print(" * Killed for ");
+ if (ew.type == Uid.Proc.ExcessivePower.TYPE_WAKE) {
+ pw.print("wake lock");
+ } else if (ew.type == Uid.Proc.ExcessivePower.TYPE_CPU) {
+ pw.print("cpu");
+ } else {
+ pw.print("unknown");
+ }
+ pw.print(" use: ");
TimeUtils.formatDuration(ew.usedTime, pw);
pw.print(" over ");
TimeUtils.formatDuration(ew.overTime, pw);
diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java
index 4e61ddf..66149ac 100644
--- a/core/java/com/android/internal/os/BatteryStatsImpl.java
+++ b/core/java/com/android/internal/os/BatteryStatsImpl.java
@@ -67,7 +67,7 @@ public final class BatteryStatsImpl extends BatteryStats {
private static final int MAGIC = 0xBA757475; // 'BATSTATS'
// Current on-disk Parcel version
- private static final int VERSION = 51;
+ private static final int VERSION = 52;
// Maximum number of items we will record in the history.
private static final int MAX_HISTORY_ITEMS = 2000;
@@ -85,7 +85,7 @@ public final class BatteryStatsImpl extends BatteryStats {
static final int MSG_UPDATE_WAKELOCKS = 1;
static final int MSG_REPORT_POWER_CHANGE = 2;
- static final long DELAY_UPDATE_WAKELOCKS = 15*1000;
+ static final long DELAY_UPDATE_WAKELOCKS = 5*1000;
public interface BatteryCallback {
public void batteryNeedsCpuUpdate();
@@ -1476,6 +1476,13 @@ public final class BatteryStatsImpl extends BatteryStats {
}
}
+ public void reportExcessiveCpuLocked(int uid, String proc, long overTime, long usedTime) {
+ Uid u = mUidStats.get(uid);
+ if (u != null) {
+ u.reportExcessiveCpuLocked(proc, overTime, usedTime);
+ }
+ }
+
int mSensorNesting;
public void noteStartSensorLocked(int uid, int sensor) {
@@ -2977,7 +2984,7 @@ public final class BatteryStatsImpl extends BatteryStats {
SamplingCounter[] mSpeedBins;
- ArrayList<ExcessiveWake> mExcessiveWake;
+ ArrayList<ExcessivePower> mExcessivePower;
Proc() {
mUnpluggables.add(this);
@@ -3005,55 +3012,69 @@ public final class BatteryStatsImpl extends BatteryStats {
}
}
- public int countExcessiveWakes() {
- return mExcessiveWake != null ? mExcessiveWake.size() : 0;
+ public int countExcessivePowers() {
+ return mExcessivePower != null ? mExcessivePower.size() : 0;
}
- public ExcessiveWake getExcessiveWake(int i) {
- if (mExcessiveWake != null) {
- return mExcessiveWake.get(i);
+ public ExcessivePower getExcessivePower(int i) {
+ if (mExcessivePower != null) {
+ return mExcessivePower.get(i);
}
return null;
}
public void addExcessiveWake(long overTime, long usedTime) {
- if (mExcessiveWake == null) {
- mExcessiveWake = new ArrayList<ExcessiveWake>();
+ if (mExcessivePower == null) {
+ mExcessivePower = new ArrayList<ExcessivePower>();
}
- ExcessiveWake ew = new ExcessiveWake();
+ ExcessivePower ew = new ExcessivePower();
+ ew.type = ExcessivePower.TYPE_WAKE;
ew.overTime = overTime;
ew.usedTime = usedTime;
- mExcessiveWake.add(ew);
+ mExcessivePower.add(ew);
}
- void writeExcessiveWakeToParcelLocked(Parcel out) {
- if (mExcessiveWake == null) {
+ public void addExcessiveCpu(long overTime, long usedTime) {
+ if (mExcessivePower == null) {
+ mExcessivePower = new ArrayList<ExcessivePower>();
+ }
+ ExcessivePower ew = new ExcessivePower();
+ ew.type = ExcessivePower.TYPE_CPU;
+ ew.overTime = overTime;
+ ew.usedTime = usedTime;
+ mExcessivePower.add(ew);
+ }
+
+ void writeExcessivePowerToParcelLocked(Parcel out) {
+ if (mExcessivePower == null) {
out.writeInt(0);
return;
}
- final int N = mExcessiveWake.size();
+ final int N = mExcessivePower.size();
out.writeInt(N);
for (int i=0; i<N; i++) {
- ExcessiveWake ew = mExcessiveWake.get(i);
+ ExcessivePower ew = mExcessivePower.get(i);
+ out.writeInt(ew.type);
out.writeLong(ew.overTime);
out.writeLong(ew.usedTime);
}
}
- void readExcessiveWakeFromParcelLocked(Parcel in) {
+ void readExcessivePowerFromParcelLocked(Parcel in) {
final int N = in.readInt();
if (N == 0) {
- mExcessiveWake = null;
+ mExcessivePower = null;
return;
}
- mExcessiveWake = new ArrayList<ExcessiveWake>();
+ mExcessivePower = new ArrayList<ExcessivePower>();
for (int i=0; i<N; i++) {
- ExcessiveWake ew = new ExcessiveWake();
+ ExcessivePower ew = new ExcessivePower();
+ ew.type = in.readInt();
ew.overTime = in.readLong();
ew.usedTime = in.readLong();
- mExcessiveWake.add(ew);
+ mExcessivePower.add(ew);
}
}
@@ -3082,7 +3103,7 @@ public final class BatteryStatsImpl extends BatteryStats {
}
}
- writeExcessiveWakeToParcelLocked(out);
+ writeExcessivePowerToParcelLocked(out);
}
void readFromParcelLocked(Parcel in) {
@@ -3112,7 +3133,7 @@ public final class BatteryStatsImpl extends BatteryStats {
}
}
- readExcessiveWakeFromParcelLocked(in);
+ readExcessivePowerFromParcelLocked(in);
}
public BatteryStatsImpl getBatteryStats() {
@@ -3746,6 +3767,13 @@ public final class BatteryStatsImpl extends BatteryStats {
}
}
+ public void reportExcessiveCpuLocked(String proc, long overTime, long usedTime) {
+ Proc p = getProcessStatsLocked(proc);
+ if (p != null) {
+ p.addExcessiveCpu(overTime, usedTime);
+ }
+ }
+
public void noteStartSensor(int sensor) {
StopwatchTimer t = getSensorTimerLocked(sensor, true);
if (t != null) {
@@ -4688,7 +4716,7 @@ public final class BatteryStatsImpl extends BatteryStats {
p.mSpeedBins[i].readSummaryFromParcelLocked(in);
}
}
- p.readExcessiveWakeFromParcelLocked(in);
+ p.readExcessivePowerFromParcelLocked(in);
}
NP = in.readInt();
@@ -4887,7 +4915,7 @@ public final class BatteryStatsImpl extends BatteryStats {
out.writeInt(0);
}
}
- ps.writeExcessiveWakeToParcelLocked(out);
+ ps.writeExcessivePowerToParcelLocked(out);
}
}
generated by cgit v1.1 at 2025-02-13 05:27:16 +0000