Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev (5f3efd40) · Commits · e / os / android_frameworks_base

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);