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

Commit ed5559ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Send userdata from ES response to purchase webapp" into udc-dev am: 071795c0 

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



Change-Id: Iff48035f7866869498ca14301d230cfe72d69b17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 251fe7b3 071795c0

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

+9 −1
Original line number Diff line number Diff line
@@ -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

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