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

Commit 1c259cab authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Add method to reset network types" into rvc-dev am: 08459261... 

Merge "Merge "Add method to reset network types" into rvc-dev am: 08459261 am: 9d229a1e" into rvc-d1-dev-plus-aosp
parents 0983f0c4 f337d301

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48079,6 +48079,7 @@ package android.telephony { 
    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 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 setDataUsage(long, long);

    method @NonNull public android.telephony.SubscriptionPlan.Builder setNetworkTypes(@NonNull int[]);

core/java/android/telephony/SubscriptionPlan.java

+10 −0
Original line number Diff line number Diff line
@@ -372,5 +372,15 @@ public final class SubscriptionPlan implements Parcelable { 
            plan.networkTypes = Arrays.copyOf(networkTypes, networkTypes.length);

            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;

        }

    }

}