Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8abefbef authored Sep 22, 2022 by Yu-Han Yang

Re-register NetworkCallback after HAL restarts

Without this change, after HAL restarts, the HAL does not know the
current network state (wifi/cell availability).

Bug: 245891785
Test: manual
Change-Id: Ia4926d6c050a739cce5ec36225bc8419e2e69455

parent 0c22341a

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1616,6 +1616,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
	updateEnabled();		updateEnabled();
	restartLocationRequest();		restartLocationRequest();
	}		}

			// Re-register network callbacks to get an update of available networks right away.
			mNetworkConnectivityHandler.unregisterNetworkCallbacks();
			mNetworkConnectivityHandler.registerNetworkCallbacks();
	}		}

	@Override		@Override

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

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -301,6 +301,10 @@ class GnssNetworkConnectivityHandler {
	mConnMgr.registerNetworkCallback(networkRequest, mNetworkConnectivityCallback, mHandler);		mConnMgr.registerNetworkCallback(networkRequest, mNetworkConnectivityCallback, mHandler);
	}		}

			void unregisterNetworkCallbacks() {
			mConnMgr.unregisterNetworkCallback(mNetworkConnectivityCallback);
			}

	/**		/**
	* @return {@code true} if there is a data network available for outgoing connections,		* @return {@code true} if there is a data network available for outgoing connections,
	* {@code false} otherwise.		* {@code false} otherwise.