LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename getAllNetworkStateSnapshot which should be pluralized

Browse Source 
Address API review feedback, ConnectivityManager#getAllNetworkStateSnapshot
should be pluralized so rename the method to getAllNetworkStateSnapshots

(cherry picked from ag/14221105)
Bug: 183972554
Test: make, FrameworksNetTests
      FrameworksServicesTests
Merged-In: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
Change-Id: Ic18d17d05984fa2466c962c7843c0ef7183ce77c
This commit is contained in:
Aaron Huang
2021-04-17 13:46:25 +08:00
parent 19a855be79
commit da103b3365
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/api/module-lib-current.txt
View File

@@ -7,7 +7,7 @@ package android.net {
public class ConnectivityManager { public class ConnectivityManager {
method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void factoryReset(); method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK}) public void factoryReset();
method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public java.util.List<android.net.NetworkStateSnapshot> getAllNetworkStateSnapshot(); method @NonNull @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETTINGS}) public java.util.List<android.net.NetworkStateSnapshot> getAllNetworkStateSnapshots();
method @Nullable public android.net.ProxyInfo getGlobalProxy(); method @Nullable public android.net.ProxyInfo getGlobalProxy();
method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange(); method @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();
method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context); method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context);

4
framework/src/android/net/ConnectivityManager.java
View File

@@ -1435,9 +1435,9 @@ public class ConnectivityManager {
android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_STACK,
android.Manifest.permission.NETWORK_SETTINGS}) android.Manifest.permission.NETWORK_SETTINGS})
@NonNull @NonNull
public List<NetworkStateSnapshot> getAllNetworkStateSnapshot() { public List<NetworkStateSnapshot> getAllNetworkStateSnapshots() {
try { try {
return mService.getAllNetworkStateSnapshot(); return mService.getAllNetworkStateSnapshots();
} catch (RemoteException e) { } catch (RemoteException e) {
throw e.rethrowFromSystemServer(); throw e.rethrowFromSystemServer();
} }

2
framework/src/android/net/IConnectivityManager.aidl
View File

@@ -81,7 +81,7 @@ interface IConnectivityManager
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553) @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
NetworkState[] getAllNetworkState(); NetworkState[] getAllNetworkState();
List<NetworkStateSnapshot> getAllNetworkStateSnapshot(); List<NetworkStateSnapshot> getAllNetworkStateSnapshots();
boolean isActiveNetworkMetered(); boolean isActiveNetworkMetered();