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

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

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

parents 2d77156a 673f9e5c
Loading
Loading
Loading
Loading
+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