Merge "Use component details to send provisionig intent" into ics-mr0
This commit is contained in:
committed by
Android (Google) Code Review
commit
1103c3beb8
@@ -455,13 +455,14 @@ public class TetherSettings extends SettingsPreferenceFragment
|
|||||||
|
|
||||||
if (enable) {
|
if (enable) {
|
||||||
//Check if provisioning is needed
|
//Check if provisioning is needed
|
||||||
String intentStr = getActivity().getString(
|
String[] appDetails = getResources().getStringArray(
|
||||||
com.android.internal.R.string.config_mobile_hotspot_provision_intent);
|
com.android.internal.R.array.config_mobile_hotspot_provision_app);
|
||||||
|
|
||||||
if (TextUtils.isEmpty(intentStr)) {
|
if (appDetails.length != 2) {
|
||||||
mWifiApEnabler.setSoftapEnabled(true);
|
mWifiApEnabler.setSoftapEnabled(true);
|
||||||
} else {
|
} else {
|
||||||
Intent intent = new Intent(intentStr);
|
Intent intent = new Intent(Intent.ACTION_MAIN);
|
||||||
|
intent.setClassName(appDetails[0], appDetails[1]);
|
||||||
startActivityForResult(intent, MHS_REQUEST);
|
startActivityForResult(intent, MHS_REQUEST);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
Reference in New Issue
Block a user