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

Commit d779d994 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden deprecated getActiveNetworkQuotaInfo" am: 9924f6ac 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia59544cd76712acdcc406f0f0391a0bbfe5c2f9e
parents f4e66680 9924f6ac

core/java/android/net/ConnectivityManager.java

+0 −11
Original line number Diff line number Diff line
@@ -2108,17 +2108,6 @@ public class ConnectivityManager { 
        // ignored

    }



    /** {@hide} */

    @Deprecated

    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    public NetworkQuotaInfo getActiveNetworkQuotaInfo() {

        try {

            return mService.getActiveNetworkQuotaInfo();

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    /**

     * @hide

     * @deprecated Talk to TelephonyManager directly

core/java/android/net/IConnectivityManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.net.Network; 
import android.net.NetworkAgentConfig;

import android.net.NetworkCapabilities;

import android.net.NetworkInfo;

import android.net.NetworkQuotaInfo;

import android.net.NetworkRequest;

import android.net.NetworkState;

import android.net.ISocketKeepaliveCallback;
@@ -76,7 +75,6 @@ interface IConnectivityManager 
    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    NetworkState[] getAllNetworkState();



    NetworkQuotaInfo getActiveNetworkQuotaInfo();

    boolean isActiveNetworkMetered();



    boolean requestRouteToHostAddress(int networkType, in byte[] hostAddress,

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

+0 −9
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ import android.net.NetworkInfo.DetailedState; 
import android.net.NetworkMonitorManager;

import android.net.NetworkPolicyManager;

import android.net.NetworkProvider;

import android.net.NetworkQuotaInfo;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.net.NetworkStack;
@@ -1780,14 +1779,6 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        return result.toArray(new NetworkState[result.size()]);

    }



    @Override

    @Deprecated

    public NetworkQuotaInfo getActiveNetworkQuotaInfo() {

        Log.w(TAG, "Shame on UID " + Binder.getCallingUid()

                + " for calling the hidden API getNetworkQuotaInfo(). Shame!");

        return new NetworkQuotaInfo();

    }



    @Override

    public boolean isActiveNetworkMetered() {

        enforceAccessPermission();