Merge "Add error code for entitlement check failure" (c07978b2) · Commits · e / os / android_frameworks_base

core/api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -44095,8 +44095,8 @@ package android.telephony {
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_ALREADY_PURCHASED = 3; // 0x3
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_CARRIER_DISABLED = 7; // 0x7
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_CARRIER_ERROR = 8; // 0x8
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED = 13; // 0xd
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_FEATURE_NOT_SUPPORTED = 10; // 0xa
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_CONGESTED = 13; // 0xd
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE = 12; // 0xc
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUB = 14; // 0xe
		field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_OVERRIDDEN = 5; // 0x5

telephony/java/android/telephony/CarrierConfigManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -8785,7 +8785,7 @@ public class CarrierConfigManager {
		* The default value is 30 minutes.
		*
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_CARRIER_ERROR
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_CONGESTED
		* @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED
		*/
		public static final String
		KEY_PREMIUM_CAPABILITY_PURCHASE_CONDITION_BACKOFF_HYSTERESIS_TIME_MILLIS_LONG =

telephony/java/android/telephony/TelephonyManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -17324,14 +17324,14 @@ public class TelephonyManager {
		public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE = 12;

		/**
		* Purchase premium capability failed because the network is congested.
		* Purchase premium capability failed because the entitlement check failed.
		* Subsequent attempts will be throttled for the amount of time specified by
		* {@link CarrierConfigManager
		* #KEY_PREMIUM_CAPABILITY_PURCHASE_CONDITION_BACKOFF_HYSTERESIS_TIME_MILLIS_LONG}
		* and return {@link #PURCHASE_PREMIUM_CAPABILITY_RESULT_THROTTLED}.
		* Throttling will be reevaluated when the network is no longer congested.
		*/
		public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_CONGESTED = 13;
		public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED = 13;

		/**
		* Purchase premium capability failed because the request was not made on the default data
		@@ -17368,7 +17368,7 @@ public class TelephonyManager {
		PURCHASE_PREMIUM_CAPABILITY_RESULT_TIMEOUT,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_FEATURE_NOT_SUPPORTED,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_CONGESTED,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUB,
		PURCHASE_PREMIUM_CAPABILITY_RESULT_PENDING_NETWORK_SETUP})
		public @interface PurchasePremiumCapabilityResult {}
		@@ -17407,8 +17407,8 @@ public class TelephonyManager {
		return "REQUEST_FAILED";
		case PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE:
		return "NETWORK_NOT_AVAILABLE";
		case PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_CONGESTED:
		return "NETWORK_CONGESTED";
		case PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED:
		return "ENTITLEMENT_CHECK_FAILED";
		case PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUB:
		return "NOT_DEFAULT_DATA_SUB";
		case PURCHASE_PREMIUM_CAPABILITY_RESULT_PENDING_NETWORK_SETUP: