From d31d086f99332641e622d25eeed9599060f4d3c9 Mon Sep 17 00:00:00 2001
From: "Philip P. Moltmann" <moltmann@google.com>
Date: Mon, 10 Feb 2020 08:46:10 -0800
Subject: [PATCH] Revert "Revert "Adjust monkey to changed internal APIs""

This reverts commit ac5c451ac496f645a3ab01828eaaded80ad8bea0.

Test: 1:1 revert-revert
Bug: 136595429
Change-Id: I9b941d1b26d022568b3046a5f0de815c66f7d504
---
 .../com/android/commands/monkey/MonkeyActivityEvent.java | 2 +-
 .../android/commands/monkey/MonkeyNetworkMonitor.java    | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java
index 1e863830e..e77a20f09 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyActivityEvent.java
@@ -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!");
diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeyNetworkMonitor.java b/cmds/monkey/src/com/android/commands/monkey/MonkeyNetworkMonitor.java
index 07d0dbc2a..d612c345d 100644
--- a/cmds/monkey/src/com/android/commands/monkey/MonkeyNetworkMonitor.java
+++ b/cmds/monkey/src/com/android/commands/monkey/MonkeyNetworkMonitor.java
@@ -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, "