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

Commit 612e7709 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29569717']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/29569717'] into sparse-12408240-L23900030006656331.
SPARSE_CHANGE: Ic58e7eee51e0f3a15d62ca6e5db85f1b291bd865

Change-Id: Ic1eb051da2576b2fb51c3482eccbe60f27fcb819
parents 70c5f1fb b24b6553

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