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

Commit 2cc5cf36 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android (Google) Code Review
Browse files

Merge "Fix endless loop in calling registerCallback/unregisterCallback"

parents 420f13f2 c173a866

wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java

+4 −4
Original line number Diff line number Diff line
@@ -101,13 +101,13 @@ public abstract class SharedConnectivityService extends Service { 
            @Override

            public void registerCallback(ISharedConnectivityCallback callback) {

                checkPermissions();

                mHandler.post(() -> registerCallback(callback));

                mHandler.post(() -> onRegisterCallback(callback));

            }



            @Override

            public void unregisterCallback(ISharedConnectivityCallback callback) {

                checkPermissions();

                mHandler.post(() -> unregisterCallback(callback));

                mHandler.post(() -> onUnregisterCallback(callback));

            }



            @Override
@@ -147,7 +147,7 @@ public abstract class SharedConnectivityService extends Service { 
        };

    }



    private void registerCallback(ISharedConnectivityCallback callback) {

    private void onRegisterCallback(ISharedConnectivityCallback callback) {

        // Listener gets triggered on first register using cashed data

        if (!notifyTetherNetworkUpdate(callback) || !notifyKnownNetworkUpdate(callback)

                || !notifySettingsStateUpdate(callback)
@@ -167,7 +167,7 @@ public abstract class SharedConnectivityService extends Service { 
        }

    }



    private void unregisterCallback(ISharedConnectivityCallback callback) {

    private void onUnregisterCallback(ISharedConnectivityCallback callback) {

        DeathRecipient deathRecipient = mDeathRecipientMap.get(callback);

        if (deathRecipient != null) {

            callback.asBinder().unlinkToDeath(deathRecipient, 0);