diff options
author | Paul Jensen <pauljensen@google.com> | 2014-10-22 21:22:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-22 21:22:20 +0000 |
commit | 246273ae35035b99328a5300e84ecb93067627fc (patch) | |
tree | e097f3c9df7c95aa954325907af3f90fb5fec77a /src/com/android/settings/WirelessSettings.java | |
parent | 286e3c4651fa0af76e092ea52349d5ae2235825d (diff) | |
parent | a1640daf6202b12e64bcc26647449695f9ef2a61 (diff) | |
download | packages_apps_Settings-246273ae35035b99328a5300e84ecb93067627fc.zip packages_apps_Settings-246273ae35035b99328a5300e84ecb93067627fc.tar.gz packages_apps_Settings-246273ae35035b99328a5300e84ecb93067627fc.tar.bz2 |
am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit 'a1640daf6202b12e64bcc26647449695f9ef2a61':
Launch browser directly when user selects "Mobile Plan".
Diffstat (limited to 'src/com/android/settings/WirelessSettings.java')
-rw-r--r-- | src/com/android/settings/WirelessSettings.java | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java index d142412..4f92cf6 100644 --- a/src/com/android/settings/WirelessSettings.java +++ b/src/com/android/settings/WirelessSettings.java @@ -21,6 +21,7 @@ import android.app.Activity; import android.app.AlertDialog; import android.app.Dialog; import android.app.admin.DevicePolicyManager; +import android.content.ActivityNotFoundException; import android.content.ComponentName; import android.content.Context; import android.content.DialogInterface; @@ -29,6 +30,7 @@ import android.content.pm.PackageManager; import android.content.res.Resources; import android.net.ConnectivityManager; import android.net.NetworkInfo; +import android.net.Uri; import android.nfc.NfcAdapter; import android.nfc.NfcManager; import android.os.Bundle; @@ -117,8 +119,6 @@ public class WirelessSettings extends SettingsPreferenceFragment } private String mManageMobilePlanMessage; - private static final String CONNECTED_TO_PROVISIONING_NETWORK_ACTION - = "com.android.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK_ACTION"; public void onManageMobilePlanClick() { log("onManageMobilePlanClick:"); mManageMobilePlanMessage = null; @@ -142,11 +142,16 @@ public class WirelessSettings extends SettingsPreferenceFragment // Get provisioning URL String url = mCm.getMobileProvisioningUrl(); if (!TextUtils.isEmpty(url)) { - Intent intent = new Intent(CONNECTED_TO_PROVISIONING_NETWORK_ACTION); - intent.putExtra("EXTRA_URL", url); - Context context = getActivity().getBaseContext(); - context.sendBroadcast(intent); - mManageMobilePlanMessage = null; + Intent intent = Intent.makeMainSelectorActivity(Intent.ACTION_MAIN, + Intent.CATEGORY_APP_BROWSER); + intent.setData(Uri.parse(url)); + intent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT | + Intent.FLAG_ACTIVITY_NEW_TASK); + try { + startActivity(intent); + } catch (ActivityNotFoundException e) { + Log.w(TAG, "onManageMobilePlanClick: startActivity failed" + e); + } } else { // No provisioning URL String operatorName = mTm.getSimOperatorName(); |