diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2020-01-21 21:32:30 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2020-01-21 21:32:30 -0800 |
| commit | 9e44006fb82d3d736bc40aeb7a904ebc745133ab (patch) | |
| tree | ee30dae0af74507d7af29d9fdc7ec8fb914ab56b /core/java/android/net/ConnectivityManager.java | |
| parent | 4fae98e08375e18035532d19f0515790785fe3cc (diff) | |
| parent | 2dda9e0627148207a8c80b226c4ed4a3682f7b9f (diff) | |
Rename NetworkMisc to NetworkAgentConfig.
am: 2dda9e0627
Change-Id: I1dae34487a5ea484c17895a2d7ae694e8ae1973a
Diffstat (limited to 'core/java/android/net/ConnectivityManager.java')
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index e8740c8e5de0..11c1a9c32d8a 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -3173,8 +3173,8 @@ public class ConnectivityManager { */ @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public Network registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp, - NetworkCapabilities nc, int score, NetworkMisc misc) { - return registerNetworkAgent(messenger, ni, lp, nc, score, misc, NetworkProvider.ID_NONE); + NetworkCapabilities nc, int score, NetworkAgentConfig config) { + return registerNetworkAgent(messenger, ni, lp, nc, score, config, NetworkProvider.ID_NONE); } /** @@ -3184,9 +3184,10 @@ public class ConnectivityManager { */ @RequiresPermission(android.Manifest.permission.NETWORK_FACTORY) public Network registerNetworkAgent(Messenger messenger, NetworkInfo ni, LinkProperties lp, - NetworkCapabilities nc, int score, NetworkMisc misc, int providerId) { + NetworkCapabilities nc, int score, NetworkAgentConfig config, int providerId) { + try { - return mService.registerNetworkAgent(messenger, ni, lp, nc, score, misc, providerId); + return mService.registerNetworkAgent(messenger, ni, lp, nc, score, config, providerId); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } |
