Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "SlicePurchaseActivity don't send canceled on manual finish" into udc-dev am: 5f3efd4039 am: ab96b07cfa

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

Change-Id: I8dcd70b680ddd6d14d31be62133408358fdc0586
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Kim
2023-05-02 22:23:53 +00:00
committed by Automerger Merge Worker
parent ff9118b486 ab96b07cfa
commit 819987a6d6
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java
View File

@@ -60,6 +60,7 @@ public class SlicePurchaseActivity extends Activity {
@NonNull private Intent mIntent; @NonNull private Intent mIntent;
@NonNull private URL mUrl; @NonNull private URL mUrl;
@TelephonyManager.PremiumCapability protected int mCapability; @TelephonyManager.PremiumCapability protected int mCapability;
private boolean mIsUserTriggeredFinish;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -71,6 +72,7 @@ public class SlicePurchaseActivity extends Activity {
SlicePurchaseController.PREMIUM_CAPABILITY_INVALID); SlicePurchaseController.PREMIUM_CAPABILITY_INVALID);
String url = mIntent.getStringExtra(SlicePurchaseController.EXTRA_PURCHASE_URL); String url = mIntent.getStringExtra(SlicePurchaseController.EXTRA_PURCHASE_URL);
mApplicationContext = getApplicationContext(); mApplicationContext = getApplicationContext();
mIsUserTriggeredFinish = true;
logd("onCreate: subId=" + subId + ", capability=" logd("onCreate: subId=" + subId + ", capability="
+ TelephonyManager.convertPremiumCapabilityToString(mCapability) + ", url=" + url); + TelephonyManager.convertPremiumCapabilityToString(mCapability) + ", url=" + url);
@@ -153,12 +155,20 @@ public class SlicePurchaseActivity extends Activity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
logd("onDestroy: User canceled the purchase by closing the application."); if (mIsUserTriggeredFinish) {
SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse( logd("onDestroy: User canceled the purchase by closing the application.");
mIntent, SlicePurchaseController.EXTRA_INTENT_CANCELED); SlicePurchaseBroadcastReceiver.sendSlicePurchaseAppResponse(
mIntent, SlicePurchaseController.EXTRA_INTENT_CANCELED);
}
super.onDestroy(); super.onDestroy();
} }
@Override
public void finishAndRemoveTask() {
mIsUserTriggeredFinish = false;
super.finishAndRemoveTask();
}
private void setupWebView() { private void setupWebView() {
// Create WebView // Create WebView
mWebView = new WebView(this); mWebView = new WebView(this);