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

Commit b24b6553 authored by Isaac Katzenelson's avatar Isaac Katzenelson Committed by Android Build Coastguard Worker
Browse files

Revert "Run callback registration on the worker provided by the client." 

This reverts commit 1b917593.

Reason for revert: Causes NPE in internalRegisterCallback, probably a race condition.

Bug: b/369292752
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:673f9e5c8550e1205749ab8e8f4189e4778f6d03)
Merged-In: Ic58e7eee51e0f3a15d62ca6e5db85f1b291bd865
Change-Id: Ic58e7eee51e0f3a15d62ca6e5db85f1b291bd865
parent 70c5f1fb

wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java

+10 −18
Original line number Diff line number Diff line
@@ -173,10 +173,6 @@ public class SharedConnectivityManager { 
                }

            }

        }



        Executor getExecutor() {

            return mExecutor;

        }

    }



    private ISharedConnectivityService mService;
@@ -192,7 +188,7 @@ public class SharedConnectivityManager { 
    private final String mServicePackageName;

    private final String mIntentAction;

    private ServiceConnection mServiceConnection;

    private final UserManager mUserManager;

    private UserManager mUserManager;



    /**

     * Creates a new instance of {@link SharedConnectivityManager}.
@@ -320,8 +316,6 @@ public class SharedConnectivityManager { 


    private void registerCallbackInternal(SharedConnectivityClientCallback callback,

            SharedConnectivityCallbackProxy proxy) {

        proxy.getExecutor().execute(

                () -> {

        try {

            mService.registerCallback(proxy);

            synchronized (mProxyDataLock) {
@@ -332,8 +326,6 @@ public class SharedConnectivityManager { 
            callback.onRegisterCallbackFailed(e);

        }

    }

        );

    }



    /**

     * @hide