Allow blocking calls to ActivityController
ActivityControllers are used in tests (e.g. monkeys), therefore
we are not concerned about misbehaving activity controllers on
production devices.
Fixes: 147705653
Test: run a monkey to ensure that activities can still start and
there are no ONEWAY_FLAG warnings from BinderProxy
Change-Id: If14c17e821106e27b562e2ddf76edfd3bdcdd80a
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ad550c5..d6d24e7 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8387,6 +8387,9 @@
@Override
public void setActivityController(IActivityController controller, boolean imAMonkey) {
+ if (controller != null) {
+ Binder.allowBlocking(controller.asBinder());
+ }
mActivityTaskManager.setActivityController(controller, imAMonkey);
}