From faf032cd3758746a31404d8e87d444c3e746ab32 Mon Sep 17 00:00:00 2001 From: Isaac Katzenelson Date: Wed, 15 Feb 2023 05:55:52 +0000 Subject: Add TetherNetwork as parameter to disconnectTetherNetwork Bug: 269308387 API-Coverage-Bug: 265968015 Test: atest SharedConnectivityManagerTest Change-Id: If059cd501a7c4fb60d4a9ebc2d15c5e4374078b0 --- .../wifi/sharedconnectivity/app/SharedConnectivityManager.java | 6 ++++-- .../sharedconnectivity/service/ISharedConnectivityService.aidl | 2 +- .../sharedconnectivity/service/SharedConnectivityService.java | 8 +++++--- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'wifi/java') 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 74b42d41d9d1..9593c8ae77a8 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/app/SharedConnectivityManager.java @@ -340,16 +340,18 @@ public class SharedConnectivityManager { * Send command to the implementation of {@link SharedConnectivityService} requesting * disconnection from the active Tether Network. * + * @param network {@link TetherNetwork} object representing the network the user has requested + * to disconnect from. * @return Returns true if the service received the command. Does not guarantee that the * disconnection was successful. */ - public boolean disconnectTetherNetwork() { + public boolean disconnectTetherNetwork(@NonNull TetherNetwork network) { if (mService == null) { return false; } try { - mService.disconnectTetherNetwork(); + mService.disconnectTetherNetwork(network); } catch (RemoteException e) { Log.e(TAG, "Exception in disconnectTetherNetwork", e); return false; diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityService.aidl b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityService.aidl index 5d79405ba19a..52da596081a4 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityService.aidl +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/ISharedConnectivityService.aidl @@ -27,7 +27,7 @@ interface ISharedConnectivityService { void registerCallback(in ISharedConnectivityCallback callback); void unregisterCallback(in ISharedConnectivityCallback callback); void connectTetherNetwork(in TetherNetwork network); - void disconnectTetherNetwork(); + void disconnectTetherNetwork(in TetherNetwork network); void connectKnownNetwork(in KnownNetwork network); void forgetKnownNetwork(in KnownNetwork network); } diff --git a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java index a0b931f24dfe..13084f47efe6 100644 --- a/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java +++ b/wifi/java/src/android/net/wifi/sharedconnectivity/service/SharedConnectivityService.java @@ -117,9 +117,9 @@ public abstract class SharedConnectivityService extends Service { } @Override - public void disconnectTetherNetwork() { + public void disconnectTetherNetwork(TetherNetwork network) { checkPermissions(); - mHandler.post(() -> onDisconnectTetherNetwork()); + mHandler.post(() -> onDisconnectTetherNetwork(network)); } @Override @@ -323,8 +323,10 @@ public abstract class SharedConnectivityService extends Service { * Implementing application should implement this method. * * Implementation should initiate a disconnection from the active Tether Network. + * + * @param network Object identifying the Tether Network the user has requested to disconnect. */ - public abstract void onDisconnectTetherNetwork(); + public abstract void onDisconnectTetherNetwork(@NonNull TetherNetwork network); /** * Implementing application should implement this method. -- cgit v1.2.3-59-g8ed1b