Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[FUI23] Remove getNetworkQuotaInfo"

Browse Source
This commit is contained in:
Junyu Lai
2021-03-05 10:05:06 +00:00
committed by Gerrit Code Review
parent 918e60b615 52facd7e3a
commit 0bb7932183
2 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/net/INetworkPolicyManager.aidl
View File

@@ -19,8 +19,6 @@ package android.net;
import android.net.INetworkPolicyListener; import android.net.INetworkPolicyListener;
import android.net.Network; import android.net.Network;
import android.net.NetworkPolicy; import android.net.NetworkPolicy;
import android.net.NetworkQuotaInfo;
import android.net.NetworkState;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.telephony.SubscriptionPlan; import android.telephony.SubscriptionPlan;
@@ -70,9 +68,6 @@ interface INetworkPolicyManager {
int getMultipathPreference(in Network network); int getMultipathPreference(in Network network);
@UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)
NetworkQuotaInfo getNetworkQuotaInfo(in NetworkState state);
SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage); SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage);
void setSubscriptionPlans(int subId, in SubscriptionPlan[] plans, String callingPackage); void setSubscriptionPlans(int subId, in SubscriptionPlan[] plans, String callingPackage);
String getSubscriptionPlansOwner(int subId); String getSubscriptionPlansOwner(int subId);

9
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -167,7 +167,6 @@ import android.net.NetworkIdentity;
import android.net.NetworkPolicy; import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager; import android.net.NetworkPolicyManager;
import android.net.NetworkPolicyManager.UidState; import android.net.NetworkPolicyManager.UidState;
import android.net.NetworkQuotaInfo;
import android.net.NetworkRequest; import android.net.NetworkRequest;
import android.net.NetworkSpecifier; import android.net.NetworkSpecifier;
import android.net.NetworkStack; 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) { private void enforceSubscriptionPlanAccess(int subId, int callingUid, String callingPackage) {
// Verify they're not lying about package name // Verify they're not lying about package name
mAppOps.checkPackage(callingUid, callingPackage); mAppOps.checkPackage(callingUid, callingPackage);