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

Commit 35287e4b authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Add method to reset network types" am: 96d59d75 

Change-Id: Id9ac3d0395d454647e19a17aef9b50e94c99a90e
parents 4bebeec5 96d59d75

api/current.txt

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

        }

    }

}