commit b80ebc9643ef1797ae6e53f5f0807afc525da7de
author Etan Cohen <etancohen@google.com> Thu Jan 25 08:46:40 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jan 27 00:04:42 2018 +0000
tree 13852549357ba9a9229ec1cdfa36bd894de9f7d8
parent 9a77a11bc033f15d090c238ec7bca5bc86a931aa

[RTT] Run HDM status change listener on a local handler

Specify a local handler on which to run the HDM status change
listener. Otherwise (with null) the status listener is run synchronous/
blocking (inline) and is causing deadlock.

Bug: 72463371
Test: unit test, integration test
Change-Id: I20cfc4ffe05307b30623cdd435aaa7275290b406
(cherry picked from commit bf8ba2170fc9a8f019b932eb43f375f341afcc89)

service/java/com/android/server/wifi/rtt/RttNative.java

diff --git a/service/java/com/android/server/wifi/rtt/RttNative.java b/service/java/com/android/server/wifi/rtt/RttNative.java
index 9ffda91..e749248 100644
--- a/service/java/com/android/server/wifi/rtt/RttNative.java
+++ b/service/java/com/android/server/wifi/rtt/RttNative.java
@@ -30,6 +30,7 @@
 import android.net.wifi.rtt.RangingRequest;
 import android.net.wifi.rtt.RangingResult;
 import android.net.wifi.rtt.ResponderConfig;
+import android.os.Handler;
 import android.os.RemoteException;
 import android.util.Log;
 
@@ -63,13 +64,13 @@
     /**
      * Initialize the object - registering with the HAL device manager.
      */
-    public void start() {
+    public void start(Handler handler) {
         synchronized (mLock) {
             mHalDeviceManager.initialize();
             mHalDeviceManager.registerStatusListener(() -> {
                 if (VDBG) Log.d(TAG, "hdm.onStatusChanged");
                 updateController();
-            }, null);
+            }, handler);
             updateController();
         }
     }

service/java/com/android/server/wifi/rtt/RttServiceImpl.java

diff --git a/service/java/com/android/server/wifi/rtt/RttServiceImpl.java b/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
index 8918fda..c709ec9 100644
--- a/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
+++ b/service/java/com/android/server/wifi/rtt/RttServiceImpl.java
@@ -176,7 +176,7 @@
         }, intentFilter);
 
         mRttServiceSynchronized.mHandler.post(() -> {
-            rttNative.start();
+            rttNative.start(mRttServiceSynchronized.mHandler);
         });
     }
 

service/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java

diff --git a/service/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java b/service/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
index 3f64de9..6048e52 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/rtt/RttNativeTest.java
@@ -88,7 +88,7 @@
         when(mockRttController.rangeCancel(anyInt(), any(ArrayList.class))).thenReturn(status);
 
         mDut = new RttNative(mockRttServiceImpl, mockHalDeviceManager);
-        mDut.start();
+        mDut.start(null);
         verify(mockHalDeviceManager).registerStatusListener(mHdmStatusListener.capture(), any());
         verify(mockRttController).registerEventCallback(any());
         verify(mockRttServiceImpl).enableIfPossible();

service/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java

diff --git a/service/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
index 838d379..fc7112a 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/rtt/RttServiceImplTest.java
@@ -207,7 +207,7 @@
                 BroadcastReceiver.class);
         verify(mockContext, times(2)).registerReceiver(bcastRxCaptor.capture(),
                 any(IntentFilter.class));
-        verify(mockNative).start();
+        verify(mockNative).start(any());
         mPowerBcastReceiver = bcastRxCaptor.getAllValues().get(0);
         mLocationModeReceiver = bcastRxCaptor.getAllValues().get(1);