Merge "Expose existing SubscriptionPlan APIs." (5dd54fdf) · Commits · e / os / android_frameworks_base

api/current.txt

+48 −9

Original line number	Diff line number	Diff line
		@@ -11533,15 +11533,15 @@ package android.content.res {

		public final class AssetManager implements java.lang.AutoCloseable {
		method public void close();
		method public final java.lang.String[] getLocales();
		method public final java.lang.String[] list(java.lang.String) throws java.io.IOException;
		method public final java.io.InputStream open(java.lang.String) throws java.io.IOException;
		method public final java.io.InputStream open(java.lang.String, int) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;
		method public final android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;
		method public final android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;
		method public final android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;
		method public java.lang.String[] getLocales();
		method public java.lang.String[] list(java.lang.String) throws java.io.IOException;
		method public java.io.InputStream open(java.lang.String) throws java.io.IOException;
		method public java.io.InputStream open(java.lang.String, int) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;
		method public android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;
		method public android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;
		method public android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;
		field public static final int ACCESS_BUFFER = 3; // 0x3
		field public static final int ACCESS_RANDOM = 1; // 0x1
		field public static final int ACCESS_STREAMING = 2; // 0x2
		@@ -40901,6 +40901,7 @@ package android.telephony {
		field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_VAL_STRING = "ci_action_on_sys_update_extra_val_string";
		field public static final java.lang.String KEY_CI_ACTION_ON_SYS_UPDATE_INTENT_STRING = "ci_action_on_sys_update_intent_string";
		field public static final java.lang.String KEY_CONFIG_IMS_PACKAGE_OVERRIDE_STRING = "config_ims_package_override_string";
		field public static final java.lang.String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING = "config_plans_package_override_string";
		field public static final java.lang.String KEY_CONFIG_TELEPHONY_USE_OWN_NUMBER_FOR_VOICEMAIL_BOOL = "config_telephony_use_own_number_for_voicemail_bool";
		field public static final java.lang.String KEY_CSP_ENABLED_BOOL = "csp_enabled_bool";
		field public static final java.lang.String KEY_DATA_LIMIT_THRESHOLD_BYTES_LONG = "data_limit_threshold_bytes_long";
		@@ -41594,10 +41595,16 @@ package android.telephony {
		method public static int getDefaultSmsSubscriptionId();
		method public static int getDefaultSubscriptionId();
		method public static int getDefaultVoiceSubscriptionId();
		method public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
		method public boolean isNetworkRoaming(int);
		method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
		method public void setSubscriptionOverrideCongested(int, boolean, long);
		method public void setSubscriptionOverrideUnmetered(int, boolean, long);
		method public void setSubscriptionPlans(int, java.util.List<android.telephony.SubscriptionPlan>);
		field public static final java.lang.String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";
		field public static final java.lang.String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";
		field public static final java.lang.String ACTION_MANAGE_SUBSCRIPTION_PLANS = "android.telephony.action.MANAGE_SUBSCRIPTION_PLANS";
		field public static final java.lang.String ACTION_REFRESH_SUBSCRIPTION_PLANS = "android.telephony.action.REFRESH_SUBSCRIPTION_PLANS";
		field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
		field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
		field public static final java.lang.String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";
		@@ -41609,6 +41616,38 @@ package android.telephony {
		method public void onSubscriptionsChanged();
		}

		public final class SubscriptionPlan implements android.os.Parcelable {
		method public java.util.Iterator<android.util.Pair<java.time.ZonedDateTime, java.time.ZonedDateTime>> cycleIterator();
		method public int describeContents();
		method public int getDataLimitBehavior();
		method public long getDataLimitBytes();
		method public long getDataUsageBytes();
		method public long getDataUsageTime();
		method public java.lang.CharSequence getSummary();
		method public java.lang.CharSequence getTitle();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final long BYTES_UNKNOWN = -1L; // 0xffffffffffffffffL
		field public static final long BYTES_UNLIMITED = 9223372036854775807L; // 0x7fffffffffffffffL
		field public static final android.os.Parcelable.Creator<android.telephony.SubscriptionPlan> CREATOR;
		field public static final int LIMIT_BEHAVIOR_BILLED = 1; // 0x1
		field public static final int LIMIT_BEHAVIOR_DISABLED = 0; // 0x0
		field public static final int LIMIT_BEHAVIOR_THROTTLED = 2; // 0x2
		field public static final int LIMIT_BEHAVIOR_UNKNOWN = -1; // 0xffffffff
		field public static final long TIME_UNKNOWN = -1L; // 0xffffffffffffffffL
		}

		public static class SubscriptionPlan.Builder {
		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 createRecurringDaily(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringMonthly(java.time.ZonedDateTime);
		method public static android.telephony.SubscriptionPlan.Builder createRecurringWeekly(java.time.ZonedDateTime);
		method public android.telephony.SubscriptionPlan.Builder setDataLimit(long, int);
		method public android.telephony.SubscriptionPlan.Builder setDataUsage(long, long);
		method public android.telephony.SubscriptionPlan.Builder setSummary(java.lang.CharSequence);
		method public android.telephony.SubscriptionPlan.Builder setTitle(java.lang.CharSequence);
		}

		public class TelephonyManager {
		method public boolean canChangeDtmfToneLength();
		method public android.telephony.TelephonyManager createForPhoneAccountHandle(android.telecom.PhoneAccountHandle);

telephony/java/android/telephony/CarrierConfigManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -275,7 +275,6 @@ public class CarrierConfigManager {
		*
		* @see SubscriptionManager#getSubscriptionPlans(int)
		* @see SubscriptionManager#setSubscriptionPlans(int, java.util.List)
		* @hide
		*/
		@SystemApi
		public static final String KEY_CONFIG_PLANS_PACKAGE_OVERRIDE_STRING =

telephony/java/android/telephony/SubscriptionManager.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -462,8 +462,6 @@ public class SubscriptionManager {
		* <p>
		* Contains {@link #EXTRA_SUBSCRIPTION_INDEX} to indicate which subscription
		* the user is interested in.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)
		@SystemApi
		@@ -481,8 +479,6 @@ public class SubscriptionManager {
		* <p>
		* Contains {@link #EXTRA_SUBSCRIPTION_INDEX} to indicate which subscription
		* the user is interested in.
		*
		* @hide
		*/
		@SdkConstant(SdkConstantType.BROADCAST_INTENT_ACTION)
		@SystemApi
		@@ -1698,7 +1694,6 @@ public class SubscriptionManager {
		* </ul>
		*
		* @param subId the subscriber this relationship applies to
		* @hide
		*/
		@SystemApi
		public @NonNull List<SubscriptionPlan> getSubscriptionPlans(int subId) {
		@@ -1728,7 +1723,6 @@ public class SubscriptionManager {
		* @param plans the list of plans. The first plan is always the primary and
		* most important plan. Any additional plans are secondary and
		* may not be displayed or used by decision making logic.
		* @hide
		*/
		@SystemApi
		public void setSubscriptionPlans(int subId, @NonNull List<SubscriptionPlan> plans) {
		@@ -1769,7 +1763,6 @@ public class SubscriptionManager {
		* be automatically cleared, or {@code 0} to leave in the
		* requested state until explicitly cleared, or the next reboot,
		* whichever happens first.
		* @hide
		*/
		@SystemApi
		public void setSubscriptionOverrideUnmetered(int subId, boolean overrideUnmetered,
		@@ -1804,7 +1797,6 @@ public class SubscriptionManager {
		* be automatically cleared, or {@code 0} to leave in the
		* requested state until explicitly cleared, or the next reboot,
		* whichever happens first.
		* @hide
		*/
		@SystemApi
		public void setSubscriptionOverrideCongested(int subId, boolean overrideCongested,

telephony/java/android/telephony/SubscriptionPlan.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@ import java.util.Iterator;
		*
		* @see SubscriptionManager#setSubscriptionPlans(int, java.util.List)
		* @see SubscriptionManager#getSubscriptionPlans(int)
		* @hide
		*/
		@SystemApi
		public final class SubscriptionPlan implements Parcelable {