summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2016-02-26 17:24:10 -0800
committerDianne Hackborn <hackbod@google.com>2016-02-29 15:15:05 -0800
commit952cb1f15a004ee5407e3f0c4a5d5229f5e392db (patch)
tree43900db43016794fa8dc8e8b18581019bd6c9584 /apps
parent11ba1f89cba3ae135e9e091dc3e77601e7c10804 (diff)
downloadandroid_development-952cb1f15a004ee5407e3f0c4a5d5229f5e392db.tar.gz
android_development-952cb1f15a004ee5407e3f0c4a5d5229f5e392db.tar.bz2
android_development-952cb1f15a004ee5407e3f0c4a5d5229f5e392db.zip
Fix issue #27385109: control activity behavior without triggering...
...isUserAMonkey for testing purpose Change-Id: If261bc860d3974796ec382dcd5f625d40ab093a5
Diffstat (limited to 'apps')
-rw-r--r--apps/Development/src/com/android/development/BadBehaviorActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/Development/src/com/android/development/BadBehaviorActivity.java b/apps/Development/src/com/android/development/BadBehaviorActivity.java
index d34c3132e..e33c758de 100644
--- a/apps/Development/src/com/android/development/BadBehaviorActivity.java
+++ b/apps/Development/src/com/android/development/BadBehaviorActivity.java
@@ -77,7 +77,7 @@ public class BadBehaviorActivity extends Activity {
public boolean activityStarting(Intent intent, String pkg) {
try {
- ActivityManagerNative.getDefault().setActivityController(null);
+ ActivityManagerNative.getDefault().setActivityController(null, false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
}
@@ -218,7 +218,7 @@ public class BadBehaviorActivity extends Activity {
Log.i(TAG, "ANR system pressed -- about to engage");
try {
ActivityManagerNative.getDefault().setActivityController(
- new BadController(20000));
+ new BadController(20000), false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
}
@@ -233,7 +233,7 @@ public class BadBehaviorActivity extends Activity {
Log.i(TAG, "Wedge system pressed -- about to engage");
try {
ActivityManagerNative.getDefault().setActivityController(
- new BadController(300000));
+ new BadController(300000), false);
} catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
}