Merge "Call onServiceDisconnected on callback executor" into main (79a5f5ac) · Commits · e / os / android_frameworks_base

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

+16 −4

Original line number	Diff line number	Diff line
		@@ -97,6 +97,18 @@ public class SharedConnectivityManager {
		}
		}

		@Override
		public void onServiceDisconnected() {
		if (mCallback != null) {
		final long token = Binder.clearCallingIdentity();
		try {
		mExecutor.execute(() -> mCallback.onServiceDisconnected());
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}
		}

		@Override
		public void onHotspotNetworksUpdated(@NonNull List<HotspotNetwork> networks) {
		if (mCallback != null) {
		@@ -247,13 +259,13 @@ public class SharedConnectivityManager {
		mService = null;
		synchronized (mProxyDataLock) {
		if (!mCallbackProxyCache.isEmpty()) {
		mCallbackProxyCache.keySet().forEach(
		SharedConnectivityClientCallback::onServiceDisconnected);
		mCallbackProxyCache.values().forEach(
		SharedConnectivityCallbackProxy::onServiceDisconnected);
		mCallbackProxyCache.clear();
		}
		if (!mProxyMap.isEmpty()) {
		mProxyMap.keySet().forEach(
		SharedConnectivityClientCallback::onServiceDisconnected);
		mProxyMap.values().forEach(
		SharedConnectivityCallbackProxy::onServiceDisconnected);
		mProxyMap.clear();
		}
		}

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,4 +32,5 @@ interface ISharedConnectivityCallback {
		oneway void onKnownNetworkConnectionStatusChanged(in KnownNetworkConnectionStatus status);
		oneway void onSharedConnectivitySettingsChanged(in SharedConnectivitySettingsState state);
		oneway void onServiceConnected();
		oneway void onServiceDisconnected();
		}