Merge "Detect non-oneway calls leaving system_server."

am: a3bc4bd66d

Change-Id: I911e76ef7a361c74c61b67fba6fabbd43726e3e9

1 files changed, 4 insertions, 0 deletions

diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index 35ff744ec..ad13d00a0 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -3449,6 +3449,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
         if (clientInterface == null) {
             Log.e(TAG, "Could not get IClientInterface instance from wificond");
             return null;
+        } else {
+            Binder.allowBlocking(clientInterface.asBinder());
         }
 
         return clientInterface;
@@ -3468,6 +3470,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiRss
         if (apInterface == null) {
             Log.e(TAG, "Could not get IApInterface instance from wificond");
             return null;
+        } else {
+            Binder.allowBlocking(apInterface.asBinder());
         }
 
         if (!mWifiNative.startHal()) {