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

Merge "Add method to reset network types" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-21 00:02:18 +00:00
committed by Android (Google) Code Review
parent c3b84378a4 a59764edc9
commit 08459261b8
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -48078,6 +48078,7 @@ package android.telephony {
method public android.telephony.SubscriptionPlan build(); method public android.telephony.SubscriptionPlan build();
method public static android.telephony.SubscriptionPlan.Builder createNonrecurring(java.time.ZonedDateTime, java.time.ZonedDateTime); method public static android.telephony.SubscriptionPlan.Builder createNonrecurring(java.time.ZonedDateTime, java.time.ZonedDateTime);
method public static android.telephony.SubscriptionPlan.Builder createRecurring(java.time.ZonedDateTime, java.time.Period); method public static android.telephony.SubscriptionPlan.Builder createRecurring(java.time.ZonedDateTime, java.time.Period);
method @NonNull public android.telephony.SubscriptionPlan.Builder resetNetworkTypes();
method public android.telephony.SubscriptionPlan.Builder setDataLimit(long, int); method public android.telephony.SubscriptionPlan.Builder setDataLimit(long, int);
method public android.telephony.SubscriptionPlan.Builder setDataUsage(long, long); method public android.telephony.SubscriptionPlan.Builder setDataUsage(long, long);
method @NonNull public android.telephony.SubscriptionPlan.Builder setNetworkTypes(@NonNull int[]); method @NonNull public android.telephony.SubscriptionPlan.Builder setNetworkTypes(@NonNull int[]);

10
core/java/android/telephony/SubscriptionPlan.java
View File

@@ -372,5 +372,15 @@ public final class SubscriptionPlan implements Parcelable {
plan.networkTypes = Arrays.copyOf(networkTypes, networkTypes.length); plan.networkTypes = Arrays.copyOf(networkTypes, networkTypes.length);
return this; return this;
} }
/**
* Reset any network types that were set with {@link #setNetworkTypes(int[])}.
* This will make the SubscriptionPlan apply to all network types.
*/
public @NonNull Builder resetNetworkTypes() {
plan.networkTypes = Arrays.copyOf(TelephonyManager.getAllNetworkTypes(),
TelephonyManager.getAllNetworkTypes().length);
return this;
}
} }
} }