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

Commit 1cf91818 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "API review: Spell out subscription"

parents 57e248f5 f88b8893

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -44117,7 +44117,7 @@ package android.telephony { 
    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_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_NOT_DEFAULT_DATA_SUBSCRIPTION = 14; // 0xe

    field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_OVERRIDDEN = 5; // 0x5

    field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_PENDING_NETWORK_SETUP = 15; // 0xf

    field public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_REQUEST_FAILED = 11; // 0xb

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ public class SlicePurchaseActivity extends Activity { 
            loge("Unable to start the slice purchase application on the non-default data "

                    + "subscription: " + mSubId);

            SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse(

                    intent, SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUB);

                    intent, SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUBSCRIPTION);

            finishAndRemoveTask();

            return;

        }

packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseBroadcastReceiver.java

+3 −3
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ public class SlicePurchaseBroadcastReceiver extends BroadcastReceiver{ 
                && isPendingIntentValid(intent, SlicePurchaseController.EXTRA_INTENT_CARRIER_ERROR)

                && isPendingIntentValid(intent, SlicePurchaseController.EXTRA_INTENT_REQUEST_FAILED)

                && isPendingIntentValid(intent,

                        SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUB)

                        SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUBSCRIPTION)

                && isPendingIntentValid(intent, SlicePurchaseController.EXTRA_INTENT_SUCCESS);

    }
@@ -204,8 +204,8 @@ public class SlicePurchaseBroadcastReceiver extends BroadcastReceiver{ 
            case SlicePurchaseController.EXTRA_INTENT_CANCELED: return "canceled";

            case SlicePurchaseController.EXTRA_INTENT_CARRIER_ERROR: return "carrier error";

            case SlicePurchaseController.EXTRA_INTENT_REQUEST_FAILED: return "request failed";

            case SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUB:

                return "not default data sub";

            case SlicePurchaseController.EXTRA_INTENT_NOT_DEFAULT_DATA_SUBSCRIPTION:

                return "not default data subscription";

            case SlicePurchaseController.EXTRA_INTENT_SUCCESS: return "success";

            default: {

                loge("Unknown pending intent extra: " + extra);

telephony/java/android/telephony/TelephonyManager.java

+4 −4
Original line number Diff line number Diff line
@@ -17339,7 +17339,7 @@ public class TelephonyManager { 
     * Subsequent attempts will return the same error until the request is made on the default

     * data subscription.

     */

    public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUB = 14;

    public static final int PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUBSCRIPTION = 14;















    /**















     * Purchase premium capability was successful and is waiting for the network to setup the










@@ -17369,7 +17369,7 @@ public class TelephonyManager {













            PURCHASE_PREMIUM_CAPABILITY_RESULT_FEATURE_NOT_SUPPORTED,















            PURCHASE_PREMIUM_CAPABILITY_RESULT_NETWORK_NOT_AVAILABLE,















            PURCHASE_PREMIUM_CAPABILITY_RESULT_ENTITLEMENT_CHECK_FAILED,













            PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUB,













            PURCHASE_PREMIUM_CAPABILITY_RESULT_NOT_DEFAULT_DATA_SUBSCRIPTION,















            PURCHASE_PREMIUM_CAPABILITY_RESULT_PENDING_NETWORK_SETUP})















    public @interface PurchasePremiumCapabilityResult {}
























@@ -17409,8 +17409,8 @@ public class TelephonyManager {













                return "NETWORK_NOT_AVAILABLE";















            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_NOT_DEFAULT_DATA_SUBSCRIPTION:













                return "NOT_DEFAULT_DATA_SUBSCRIPTION";















            case PURCHASE_PREMIUM_CAPABILITY_RESULT_PENDING_NETWORK_SETUP:















                return "PENDING_NETWORK_SETUP";















            default: