summaryrefslogtreecommitdiffstats
path: root/apps/Development
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-09-23 16:02:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-23 16:02:22 -0700
commitebb0b03e170b724e04a0d44bfd1ccb02452f5f57 (patch)
tree3af4b52971be6ee0fb45d3a65a03f5185f7397a3 /apps/Development
parent9de6872b4c0ab35e4466fc05f36e0b9801e06a47 (diff)
parentd424b8d9ccb569c4a2f01de248068fd130e3bd82 (diff)
downloadandroid_development-ebb0b03e170b724e04a0d44bfd1ccb02452f5f57.tar.gz
android_development-ebb0b03e170b724e04a0d44bfd1ccb02452f5f57.tar.bz2
android_development-ebb0b03e170b724e04a0d44bfd1ccb02452f5f57.zip
am d424b8d9: Prepare for a new IActivityController method.
Merge commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82' into gingerbread-plus-aosp * commit 'd424b8d9ccb569c4a2f01de248068fd130e3bd82': Prepare for a new IActivityController method.
Diffstat (limited to 'apps/Development')
-rw-r--r--apps/Development/src/com/android/development/BadBehaviorActivity.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/Development/src/com/android/development/BadBehaviorActivity.java b/apps/Development/src/com/android/development/BadBehaviorActivity.java
index 4e06ae9d2..78632206e 100644
--- a/apps/Development/src/com/android/development/BadBehaviorActivity.java
+++ b/apps/Development/src/com/android/development/BadBehaviorActivity.java
@@ -100,6 +100,10 @@ public class BadBehaviorActivity extends Activity {
return true;
}
+ public int appEarlyNotResponding(String processName, int pid, String annotation) {
+ return 0;
+ }
+
public int appNotResponding(String proc, int pid, String st) {
return 0;
}