diff options
| author | 2023-05-12 00:43:31 +0000 | |
|---|---|---|
| committer | 2023-05-12 00:43:31 +0000 | |
| commit | 425e5fc31723c2642a36c42a823e65dfc9ddb01c (patch) | |
| tree | 6838b34bdb6176ffde1c5f65995e6e089f80ab9d | |
| parent | 788c38cf5d3c59e9373a9f538454198d57be3721 (diff) | |
| parent | ed5559ac956394d25056b0e9dab5aa7e9341af1b (diff) | |
Merge "Send userdata from ES response to purchase webapp" into udc-dev am: 071795c050 am: ed5559ac95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23151916
Change-Id: Ifab01ae638063d67314e0ec2b3f92b5b371c8fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java index b888739016c7..946185a3c420 100644 --- a/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java +++ b/packages/CarrierDefaultApp/src/com/android/carrierdefaultapp/SlicePurchaseActivity.java @@ -24,6 +24,7 @@ import android.content.Intent; import android.os.Bundle; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.text.TextUtils; import android.util.Log; import android.view.KeyEvent; import android.webkit.WebView; @@ -183,7 +184,14 @@ public class SlicePurchaseActivity extends Activity { setContentView(mWebView); // Load the URL - mWebView.loadUrl(mUrl.toString()); + String userData = mIntent.getStringExtra(SlicePurchaseController.EXTRA_USER_DATA); + if (TextUtils.isEmpty(userData)) { + logd("Starting WebView with url: " + mUrl.toString()); + mWebView.loadUrl(mUrl.toString()); + } else { + logd("Starting WebView with url: " + mUrl.toString() + ", userData=" + userData); + mWebView.postUrl(mUrl.toString(), userData.getBytes()); + } } private static void logd(@NonNull String s) { |