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

Commit dbda7492 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

Change-Id: I3a15ca56fb71663273aab2f959605085ad37e0b5
parents ecaa482e 9d229a1e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48078,6 +48078,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;

        }

    }

}