LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix issue #27385109: control activity behavior without triggering..." into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-03-01 00:35:36 +00:00
committed by Android (Google) Code Review
parent 7643dcbd15 952cb1f15a
commit 391be47296
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/Development/src/com/android/development/BadBehaviorActivity.java
View File

@@ -77,7 +77,7 @@ public class BadBehaviorActivity extends Activity {
public boolean activityStarting(Intent intent, String pkg) { public boolean activityStarting(Intent intent, String pkg) {
try { try {
ActivityManagerNative.getDefault().setActivityController(null); ActivityManagerNative.getDefault().setActivityController(null, false);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", 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"); Log.i(TAG, "ANR system pressed -- about to engage");
try { try {
ActivityManagerNative.getDefault().setActivityController( ActivityManagerNative.getDefault().setActivityController(
new BadController(20000)); new BadController(20000), false);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", 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"); Log.i(TAG, "Wedge system pressed -- about to engage");
try { try {
ActivityManagerNative.getDefault().setActivityController( ActivityManagerNative.getDefault().setActivityController(
new BadController(300000)); new BadController(300000), false);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Can't call IActivityManager.setActivityController", e); Log.e(TAG, "Can't call IActivityManager.setActivityController", e);
} }

4
cmds/monkey/src/com/android/commands/monkey/Monkey.java
View File

@@ -669,7 +669,7 @@ public class Monkey {
} }
try { try {
mAm.setActivityController(null); mAm.setActivityController(null, true);
mNetworkMonitor.unregister(mAm); mNetworkMonitor.unregister(mAm);
} catch (RemoteException e) { } catch (RemoteException e) {
// just in case this was latent (after mCount cycles), make sure // just in case this was latent (after mCount cycles), make sure
@@ -952,7 +952,7 @@ public class Monkey {
} }
try { try {
mAm.setActivityController(new ActivityController()); mAm.setActivityController(new ActivityController(), true);
mNetworkMonitor.register(mAm); mNetworkMonitor.register(mAm);
} catch (RemoteException e) { } catch (RemoteException e) {
System.err.println("** Failed talking with activity manager!"); System.err.println("** Failed talking with activity manager!");