diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-09-23 17:34:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-23 17:34:22 -0700 |
| commit | b43889e8ba7b404ff12f6685e1fa27c208a85215 (patch) | |
| tree | 186b5271de3215c5e23c672dec9300b7bdf1433a /apps/Development/src/com/android/development | |
| parent | 9853eb00b340bad875ba09e1732491b3e33c110f (diff) | |
| parent | ebb0b03e170b724e04a0d44bfd1ccb02452f5f57 (diff) | |
| download | android_development-b43889e8ba7b404ff12f6685e1fa27c208a85215.tar.gz android_development-b43889e8ba7b404ff12f6685e1fa27c208a85215.tar.bz2 android_development-b43889e8ba7b404ff12f6685e1fa27c208a85215.zip | |
am ebb0b03e: am d424b8d9: Prepare for a new IActivityController method.
Merge commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57'
* commit 'ebb0b03e170b724e04a0d44bfd1ccb02452f5f57':
Prepare for a new IActivityController method.
Diffstat (limited to 'apps/Development/src/com/android/development')
| -rw-r--r-- | apps/Development/src/com/android/development/BadBehaviorActivity.java | 4 |
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; } |