Merge "Fix NPE when re-registerNetworkCallbacks" into udc-dev (feb922b0) · Commits · e / os / android_frameworks_base

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -272,6 +272,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		private long mStartedChangedElapsedRealtime;
		private int mFixInterval = 1000;

		// True if handleInitialize() has finished;
		@GuardedBy("mLock")
		private boolean mInitialized;

		private ProviderRequest mProviderRequest;

		private int mPositionMode;
		@@ -570,6 +574,9 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		}

		updateEnabled();
		synchronized (mLock) {
		mInitialized = true;
		}
		}

		private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@@ -1718,9 +1725,13 @@ public class GnssLocationProvider extends AbstractLocationProvider implements
		}

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

		@Override
		public void onCapabilitiesChanged(GnssCapabilities oldCapabilities,

+1 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,7 @@ class GnssNetworkConnectivityHandler {

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

		/**