diff options
| author | 2023-10-23 17:56:29 -0700 | |
|---|---|---|
| committer | 2023-10-27 18:47:34 -0700 | |
| commit | 477d6c5563f20056f4ab1a41fadb9c6d678f57e8 (patch) | |
| tree | 6cdb6d882c7879f55e9d1ecfe693070eebc2136a | |
| parent | afb0bc90f18c5922df1b95897059c312c7c0f188 (diff) | |
Unhide user disabled error for slicing and guard with feature flag
Test: atest SlicePurchaseControllerTest
Bug: 307378699
Change-Id: I7fc8232371fc07f5bd60dba8fe2c5dbd82b3b516
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/CarrierConfigManager.java | 1 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 18001e832afd..55bddb1449ad 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -45528,6 +45528,7 @@ package android.telephony { field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_THROTTLED = 2; // 0x2 field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_TIMEOUT = 9; // 0x9 field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_CANCELED = 6; // 0x6 + field @FlaggedApi("com.android.internal.telephony.flags.slicing_additional_error_codes") public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_DISABLED = 16; // 0x10 field public static final int SET_OPPORTUNISTIC_SUB_INACTIVE_SUBSCRIPTION = 2; // 0x2 field public static final int SET_OPPORTUNISTIC_SUB_NO_OPPORTUNISTIC_SUB_AVAILABLE = 3; // 0x3 field public static final int SET_OPPORTUNISTIC_SUB_REMOTE_SERVICE_EXCEPTION = 4; // 0x4 diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 042b2a3de0a1..4250bd14da52 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -9692,6 +9692,7 @@ public class CarrierConfigManager { * * @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_CANCELED * @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_TIMEOUT + * @see TelephonyManager#PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_DISABLED */ public static final String KEY_PREMIUM_CAPABILITY_NOTIFICATION_BACKOFF_HYSTERESIS_TIME_MILLIS_LONG = diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c0d6b301def0..e9ea5a7c2ce2 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -17483,9 +17483,8 @@ public class TelephonyManager { * {@link CarrierConfigManager * #KEY_PREMIUM_CAPABILITY_NOTIFICATION_BACKOFF_HYSTERESIS_TIME_MILLIS_LONG} * and return {@link #PURCHASE_PREMIUM_CAPABILITY_RESULT_THROTTLED}. - * - * @hide */ + @FlaggedApi(Flags.FLAG_SLICING_ADDITIONAL_ERROR_CODES) public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_USER_DISABLED = 16; /** |