Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c38779b5 authored by Aaron Huang's avatar Aaron Huang Committed by Automerger Merge Worker
Browse files

Merge "Rename getAllNetworkStateSnapshot which should be pluralized" into sc-dev am: 79613628 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14221105

Change-Id: I5d5603f79608fa8d311e7eab2b171e66fe2c75e5
parents 8890becc 79613628

packages/Connectivity/framework/api/module-lib-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ package android.net { 


  public class ConnectivityManager {

    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 @NonNull public static android.util.Range<java.lang.Integer> getIpSecNetIdRange();

    method @NonNull public static String getPrivateDnsMode(@NonNull android.content.Context);

packages/Connectivity/framework/src/android/net/ConnectivityManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1425,9 +1425,9 @@ public class ConnectivityManager { 
            android.Manifest.permission.NETWORK_STACK,

            android.Manifest.permission.NETWORK_SETTINGS})

    @NonNull

    public List<NetworkStateSnapshot> getAllNetworkStateSnapshot() {

    public List<NetworkStateSnapshot> getAllNetworkStateSnapshots() {

        try {

            return mService.getAllNetworkStateSnapshot();

            return mService.getAllNetworkStateSnapshots();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

packages/Connectivity/framework/src/android/net/IConnectivityManager.aidl

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ interface IConnectivityManager 
    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    NetworkState[] getAllNetworkState();



    List<NetworkStateSnapshot> getAllNetworkStateSnapshot();

    List<NetworkStateSnapshot> getAllNetworkStateSnapshots();



    boolean isActiveNetworkMetered();

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        PermissionUtils.enforceNetworkStackPermission(mContext);



        final ArrayList<NetworkState> result = new ArrayList<>();

        for (NetworkStateSnapshot snapshot : getAllNetworkStateSnapshot()) {

        for (NetworkStateSnapshot snapshot : getAllNetworkStateSnapshots()) {

            // NetworkStateSnapshot doesn't contain NetworkInfo, so need to fetch it from the

            // NetworkAgentInfo.

            final NetworkAgentInfo nai = getNetworkAgentInfoForNetwork(snapshot.network);
@@ -2164,7 +2164,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    @Override

    @NonNull

    public List<NetworkStateSnapshot> getAllNetworkStateSnapshot() {

    public List<NetworkStateSnapshot> getAllNetworkStateSnapshots() {

        // This contains IMSI details, so make sure the caller is privileged.

        PermissionUtils.enforceNetworkStackPermission(mContext);

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -2016,7 +2016,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        if (LOGV) Slog.v(TAG, "updateNetworkRulesNL()");

        Trace.traceBegin(TRACE_TAG_NETWORK, "updateNetworkRulesNL");



        final List<NetworkStateSnapshot> snapshots = mConnManager.getAllNetworkStateSnapshot();

        final List<NetworkStateSnapshot> snapshots = mConnManager.getAllNetworkStateSnapshots();



        // First, generate identities of all connected networks so we can

        // quickly compare them against all defined policies below.