Merge "Re-register NetworkCallback after HAL restarts"

services/core/java/com/android/server/location/gnss/GnssLocationProvider.java

@@ -1616,6 +1616,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
             updateEnabled();
             restartLocationRequest();
         }
+
+        // Re-register network callbacks to get an update of available networks right away.
+        mNetworkConnectivityHandler.unregisterNetworkCallbacks();
+        mNetworkConnectivityHandler.registerNetworkCallbacks();
     }
 
     @Override

services/core/java/com/android/server/location/gnss/GnssNetworkConnectivityHandler.java

@@ -301,6 +301,10 @@ class GnssNetworkConnectivityHandler {
         mConnMgr.registerNetworkCallback(networkRequest, mNetworkConnectivityCallback, mHandler);
     }
 
+    void unregisterNetworkCallbacks() {
+        mConnMgr.unregisterNetworkCallback(mNetworkConnectivityCallback);
+    }
+
     /**
      * @return {@code true} if there is a data network available for outgoing connections,
      * {@code false} otherwise.