diff options
Diffstat (limited to 'wifi/java/src')
| -rw-r--r-- | wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java | 20 | ||||
| -rw-r--r-- | wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl | 1 |
2 files changed, 17 insertions, 4 deletions
diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java index b0f68f7870ee..f68ae2c7e249 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -98,6 +98,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) { final long token = Binder.clearCallingIdentity(); @@ -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(); } } diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl index 521f94367f6f..7b892af3c529 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityCallback.aidl @@ -32,4 +32,5 @@ interface ISharedConnectivityCallback { oneway void onKnownNetworkConnectionStatusChanged(in KnownNetworkConnectionStatus status); oneway void onSharedConnectivitySettingsChanged(in SharedConnectivitySettingsState state); oneway void onServiceConnected(); + oneway void onServiceDisconnected(); } |