Merge "Revert "Revert "Adjust monkey to changed internal APIs"""

This commit is contained in:
Philip P. Moltmann
2020-02-12 18:52:23 +00:00
committed by Android (Google) Code Review
2 changed files with 6 additions and 5 deletions

View File

@@ -67,7 +67,7 @@ public class MonkeyActivityEvent extends MonkeyEvent {
}
try {
iam.startActivityAsUser(null, null, intent, null, null, null, 0,
iam.startActivityAsUserWithFeature(null, null, null, intent, null, null, null, 0,
0, null, null, ActivityManager.getCurrentUser());
} catch (RemoteException e) {
Logger.err.println("** Failed talking with activity manager!");

View File

@@ -85,18 +85,19 @@ public class MonkeyNetworkMonitor extends IIntentReceiver.Stub {
public void register(IActivityManager am) throws RemoteException {
if (LDEBUG) Logger.out.println("registering Receiver");
am.registerReceiver(null, null, this, filter, null, UserHandle.USER_ALL, 0);
am.registerReceiverWithFeature(null, null, null, this, filter, null, UserHandle.USER_ALL,
0);
}
public void unregister(IActivityManager am) throws RemoteException {
if (LDEBUG) Logger.out.println("unregistering Receiver");
am.unregisterReceiver(this);
}
public void stop() {
updateNetworkStats();
}
public void dump() {
Logger.out.println("## Network stats: elapsed time=" + mElapsedTime + "ms ("
+ mMobileElapsedTime + "ms mobile, "