From a59764edc9b668dcf693b0bc4736cf40ce793766 Mon Sep 17 00:00:00 2001
From: Sarah Chin <sarahchin@google.com>
Date: Fri, 20 Mar 2020 10:51:29 -0700
Subject: [PATCH] Add method to reset network types

Test: build
Bug: 148218045
Change-Id: Ia6eaba4e40fe47e79f8a7b6bcbadc61151d84823
---
 api/current.txt                                   |  1 +
 core/java/android/telephony/SubscriptionPlan.java | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 533434b86a73a..b1d3bdb29ceab 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -48089,6 +48089,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[]);
diff --git a/core/java/android/telephony/SubscriptionPlan.java b/core/java/android/telephony/SubscriptionPlan.java
index 901957f6ca4a5..d5ac4368aa97f 100644
--- a/core/java/android/telephony/SubscriptionPlan.java
+++ b/core/java/android/telephony/SubscriptionPlan.java
@@ -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;
+        }
     }
 }