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

Commit 477d6c55 authored by Sarah Chin's avatar Sarah Chin
Browse files

Unhide user disabled error for slicing and guard with feature flag 

Test: atest SlicePurchaseControllerTest
Bug: 307378699
Change-Id: I7fc8232371fc07f5bd60dba8fe2c5dbd82b3b516
parent afb0bc90

core/api/current.txt

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

telephony/java/android/telephony/CarrierConfigManager.java

+1 −0
Original line number Diff line number Diff line
@@ -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 =

telephony/java/android/telephony/TelephonyManager.java

+1 −2
Original line number Diff line number Diff line
@@ -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;















    /**