Merge "Handle 5G meteredness in telephony framework"
This commit is contained in:
@@ -22,5 +22,5 @@ oneway interface INetworkPolicyListener {
|
||||
void onMeteredIfacesChanged(in String[] meteredIfaces);
|
||||
void onRestrictBackgroundChanged(boolean restrictBackground);
|
||||
void onUidPoliciesChanged(int uid, int uidPolicies);
|
||||
void onSubscriptionOverride(int subId, int overrideMask, int overrideValue);
|
||||
void onSubscriptionOverride(int subId, int overrideMask, int overrideValue, long networkTypeMask);
|
||||
}
|
||||
|
||||
@@ -76,7 +76,7 @@ interface INetworkPolicyManager {
|
||||
SubscriptionPlan[] getSubscriptionPlans(int subId, String callingPackage);
|
||||
void setSubscriptionPlans(int subId, in SubscriptionPlan[] plans, String callingPackage);
|
||||
String getSubscriptionPlansOwner(int subId);
|
||||
void setSubscriptionOverride(int subId, int overrideMask, int overrideValue, long timeoutMillis, String callingPackage);
|
||||
void setSubscriptionOverride(int subId, int overrideMask, int overrideValue, long networkTypeMask, long timeoutMillis, String callingPackage);
|
||||
|
||||
void factoryReset(String subscriber);
|
||||
|
||||
|
||||
@@ -380,6 +380,7 @@ public class NetworkPolicyManager {
|
||||
@Override public void onMeteredIfacesChanged(String[] meteredIfaces) { }
|
||||
@Override public void onRestrictBackgroundChanged(boolean restrictBackground) { }
|
||||
@Override public void onUidPoliciesChanged(int uid, int uidPolicies) { }
|
||||
@Override public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue) { }
|
||||
@Override public void onSubscriptionOverride(int subId, int overrideMask, int overrideValue,
|
||||
long networkTypeMask) { }
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user