summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-10-17 12:46:52 -0700
committerThe Android Automerger <android-build@google.com>2013-10-17 16:40:14 -0700
commitf4ca9e6101a86fc0119867aa0b792ade95a71ad2 (patch)
tree818614255c43c89f2d16aa1a369f4660d164bfc3
parent8994e0244e8c6cf322a927276c3cf8f3189af0eb (diff)
downloadbase-f4ca9e6101a86fc0119867aa0b792ade95a71ad2.tar.gz
Change how we use provisioning url so post works
Needed to do an http post instead of a get for one carrier. Do this by putting an auto-submitting form in the data to be interpreted as a html doc by the browser. The ACTION_VIEW intent only works on http uri, but by specifying ACTION_MAIN/ CATEGORY_APP_BROWSER we could use data:text/html. bug:11168810 Change-Id: Ifd33e1c3c7f9f40b6add39e446e6a7d7cde22549
-rw-r--r--services/java/com/android/server/ConnectivityService.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index b5f0697472de..7c61c4400144 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -4467,8 +4467,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mdst.enableMobileProvisioning(url);
} else {
if (DBG) log("handleMobileProvisioningAction: on default network");
- Intent newIntent =
- new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ Intent newIntent = Intent.makeMainSelectorActivity(Intent.ACTION_MAIN,
+ Intent.CATEGORY_APP_BROWSER);
+ newIntent.setData(Uri.parse(url));
newIntent.setFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT |
Intent.FLAG_ACTIVITY_NEW_TASK);
try {