diff options
| -rw-r--r-- | packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java index 5f067e9836a2..b888739016c7 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java @@ -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() { - logd("onDestroy: User canceled the purchase by closing the application."); - SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse( - mIntent, SlicePurchaseController.EXTRA_INTENT_CANCELED); + 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); |