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

Commit 631cf8a9 authored by Sarah Kim's avatar Sarah Kim Committed by Automerger Merge Worker
Browse files

Merge "SlicePurchaseActivity don't send canceled on manual finish" into... 

Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd40 am: ab96b07c am: a67c59fa

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22580893



Change-Id: I87028a5e56ca7d2f872ceab46b2a731fe798bfa5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14c9e89e a67c59fa

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

+13 −3
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ public class SlicePurchaseActivity extends Activity { 
    @NonNull private Intent mIntent;

    @NonNull private URL mUrl;

    @TelephonyManager.PremiumCapability protected int mCapability;

    private boolean mIsUserTriggeredFinish;



    @Override

    protected void onCreate(Bundle savedInstanceState) {
@@ -71,6 +72,7 @@ public class SlicePurchaseActivity extends Activity { 
                SlicePurchaseController.PREMIUM_CAPABILITY_INVALID);

        String url = mIntent.getStringExtra(SlicePurchaseController.EXTRA_PURCHASE_URL);

        mApplicationContext = getApplicationContext();

        mIsUserTriggeredFinish = true;

        logd("onCreate: subId=" + subId + ", capability="

                + TelephonyManager.convertPremiumCapabilityToString(mCapability) + ", url=" + url);
@@ -153,12 +155,20 @@ public class SlicePurchaseActivity extends Activity { 


    @Override

    protected void onDestroy() {

        if (mIsUserTriggeredFinish) {

            logd("onDestroy: User canceled the purchase by closing the application.");

            SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse(

                    mIntent, SlicePurchaseController.EXTRA_INTENT_CANCELED);

        }

        super.onDestroy();

    }



    @Override

    public void finishAndRemoveTask() {

        mIsUserTriggeredFinish = false;

        super.finishAndRemoveTask();

    }



    private void setupWebView() {

        // Create WebView

        mWebView = new WebView(this);