commit 1484531ad99d14744fea3de8a239905a404a0c2f
author Irfan Sheriff <isheriff@google.com> Wed Nov 02 04:18:13 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 02 04:18:13 2011 +0000
tree ac365d14a70caa1e912a6b8c44ffeebb928f2672
parent 17347407edd61fc15a316fa7aa55c17b399433ea
parent 1103c3beb80c522778ae7b925d703e2ac3afd5e3

am 1103c3be: Merge "Use component details to send provisionig intent" into ics-mr0

* commit '1103c3beb80c522778ae7b925d703e2ac3afd5e3':
  Use component details to send provisionig intent

src/com/android/settings/TetherSettings.java

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 107b53a..23fe2c0 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -455,13 +455,14 @@
 
         if (enable) {
             //Check if provisioning is needed
-            String intentStr = getActivity().getString(
-                    com.android.internal.R.string.config_mobile_hotspot_provision_intent);
+            String[] appDetails = getResources().getStringArray(
+                    com.android.internal.R.array.config_mobile_hotspot_provision_app);
 
-            if (TextUtils.isEmpty(intentStr)) {
+            if (appDetails.length != 2) {
                 mWifiApEnabler.setSoftapEnabled(true);
             } else {
-                Intent intent = new Intent(intentStr);
+                Intent intent = new Intent(Intent.ACTION_MAIN);
+                intent.setClassName(appDetails[0], appDetails[1]);
                 startActivityForResult(intent, MHS_REQUEST);
             }
         } else {