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

Commit 26050067 authored by Junyu Lai's avatar Junyu Lai Committed by Automerger Merge Worker
Browse files

Merge "[FUI23] Remove getNetworkQuotaInfo" am: 0bb79321 am: 6da7e8ca 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0fcee361d93fca76a146e4ca7dd028f7f89f59a1
parents 8699e310 6da7e8ca

core/java/android/net/INetworkPolicyManager.aidl

+0 −5
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ package android.net; 
import android.net.INetworkPolicyListener;

import android.net.Network;

import android.net.NetworkPolicy;

import android.net.NetworkQuotaInfo;

import android.net.NetworkState;

import android.net.NetworkTemplate;

import android.telephony.SubscriptionPlan;
@@ -70,9 +68,6 @@ interface INetworkPolicyManager { 


    int getMultipathPreference(in Network network);



    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state);



    SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage);

    void setSubscriptionPlans(int subId, in SubscriptionPlan[] plans, String callingPackage);

    String getSubscriptionPlansOwner(int subId);

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

+0 −9
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ import android.net.NetworkIdentity; 
import android.net.NetworkPolicy;

import android.net.NetworkPolicyManager;

import android.net.NetworkPolicyManager.UidState;

import android.net.NetworkQuotaInfo;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.net.NetworkStack;
@@ -3166,14 +3165,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }

    }



    @Override

    @Deprecated

    public NetworkQuotaInfo getNetworkQuotaInfo(NetworkState state) {

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

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

        return new NetworkQuotaInfo();

    }



    private void enforceSubscriptionPlanAccess(int subId, int callingUid, String callingPackage) {

        // Verify they're not lying about package name

        mAppOps.checkPackage(callingUid, callingPackage);