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

Commit 68b27c5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when re-registerNetworkCallbacks" into udc-dev am: feb922b0 am: cfe7cf29 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22598874



Change-Id: I19a3ec9410c149a03d560e350efd5cc8facac610
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d0489a5b cfe7cf29

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

+13 −2
Original line number Original line Diff line number Diff line
@@ -272,6 +272,10 @@ public class GnssLocationProvider extends AbstractLocationProvider implements 
    private long mStartedChangedElapsedRealtime;

    private long mStartedChangedElapsedRealtime;

    private int mFixInterval = 1000;

    private int mFixInterval = 1000;





    // True if handleInitialize() has finished;

    @GuardedBy("mLock")

    private boolean mInitialized;



    private ProviderRequest mProviderRequest;

    private ProviderRequest mProviderRequest;





    private int mPositionMode;

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

        }





        updateEnabled();

        updateEnabled();

        synchronized (mLock) {

            mInitialized = true;

        }

    }

    }





    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {

    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.

        // Re-register network callbacks to get an update of available networks right away.

        synchronized (mLock) {

            if (mInitialized) {

                mNetworkConnectivityHandler.unregisterNetworkCallbacks();

                mNetworkConnectivityHandler.unregisterNetworkCallbacks();

                mNetworkConnectivityHandler.registerNetworkCallbacks();

                mNetworkConnectivityHandler.registerNetworkCallbacks();

            }

            }

        }

    }





    @Override

    @Override

    public void onCapabilitiesChanged(GnssCapabilities oldCapabilities,

    public void onCapabilitiesChanged(GnssCapabilities oldCapabilities,

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

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




    void unregisterNetworkCallbacks() {

    void unregisterNetworkCallbacks() {

        mConnMgr.unregisterNetworkCallback(mNetworkConnectivityCallback);

        mConnMgr.unregisterNetworkCallback(mNetworkConnectivityCallback);

        mNetworkConnectivityCallback = null;

    }

    }





    /**

    /**