LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of 1f65550f to master

Browse Source 
Change-Id: I65585939a57c561064d370be131c0197de0f08c3
This commit is contained in:
Amit Mahajan
2014-06-10 10:47:26 -07:00
parent b112882ab4 1f65550f8a
commit 93a3aad019
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4438,7 +4438,9 @@ public class ConnectivityService extends IConnectivityManager.Stub {
mIsProvisioningNetwork.set(true); mIsProvisioningNetwork.set(true);
MobileDataStateTracker mdst = (MobileDataStateTracker) MobileDataStateTracker mdst = (MobileDataStateTracker)
mNetTrackers[ConnectivityManager.TYPE_MOBILE]; mNetTrackers[ConnectivityManager.TYPE_MOBILE];
mdst.setInternalDataEnable(false);
// Disable radio until user starts provisioning
mdst.setRadio(false);
} else { } else {
if (DBG) log("CheckMp.onComplete: warm (no dns/tcp), no url"); if (DBG) log("CheckMp.onComplete: warm (no dns/tcp), no url");
} }
@@ -4950,17 +4952,24 @@ public class ConnectivityService extends IConnectivityManager.Stub {
// Mark notification as not visible // Mark notification as not visible
setProvNotificationVisible(false, ConnectivityManager.TYPE_MOBILE_HIPRI, null, null); setProvNotificationVisible(false, ConnectivityManager.TYPE_MOBILE_HIPRI, null, null);
// If provisioning network handle as a special case, // Check airplane mode
boolean isAirplaneModeOn = Settings.System.getInt(mContext.getContentResolver(),
Settings.Global.AIRPLANE_MODE_ON, 0) == 1;
// If provisioning network and not in airplane mode handle as a special case,
// otherwise launch browser with the intent directly. // otherwise launch browser with the intent directly.
if (mIsProvisioningNetwork.get()) { if (mIsProvisioningNetwork.get() && !isAirplaneModeOn) {
if (DBG) log("handleMobileProvisioningAction: on prov network enable then launch"); if (DBG) log("handleMobileProvisioningAction: on prov network enable then launch");
mIsProvisioningNetwork.set(false);
// mIsStartingProvisioning.set(true); // mIsStartingProvisioning.set(true);
// MobileDataStateTracker mdst = (MobileDataStateTracker) // MobileDataStateTracker mdst = (MobileDataStateTracker)
// mNetTrackers[ConnectivityManager.TYPE_MOBILE]; // mNetTrackers[ConnectivityManager.TYPE_MOBILE];
// Radio was disabled on CMP_RESULT_CODE_PROVISIONING_NETWORK, enable it here
// mdst.setRadio(true);
// mdst.setEnableFailFastMobileData(DctConstants.ENABLED); // mdst.setEnableFailFastMobileData(DctConstants.ENABLED);
// mdst.enableMobileProvisioning(url); // mdst.enableMobileProvisioning(url);
} else { } else {
if (DBG) log("handleMobileProvisioningAction: not prov network"); if (DBG) log("handleMobileProvisioningAction: not prov network");
mIsProvisioningNetwork.set(false);
// Check for apps that can handle provisioning first // Check for apps that can handle provisioning first
Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP); Intent provisioningIntent = new Intent(TelephonyIntents.ACTION_CARRIER_SETUP);
provisioningIntent.addCategory(TelephonyIntents.CATEGORY_MCCMNC_PREFIX provisioningIntent.addCategory(TelephonyIntents.CATEGORY_MCCMNC_PREFIX