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

am 78d0cf79: Merge "Tighten condition for calling checkMobileProvisioning." into klp-dev

Browse Source 
* commit '78d0cf7958dfde7951ed1a2c0317e04d6b41f4f3':
  Tighten condition for calling checkMobileProvisioning.
This commit is contained in:
Wink Saville
2013-09-14 11:21:07 -07:00
committed by Android Git Automerger
parent d0fe9386b2 ab773a7b89
commit 3418e65e81
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/java/com/android/server/ConnectivityService.java
View File

@@ -2953,8 +2953,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (ConnectivityManager.isNetworkTypeMobile(info.getType()) if (ConnectivityManager.isNetworkTypeMobile(info.getType())
&& (0 != Settings.Global.getInt(mContext.getContentResolver(), && (0 != Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0)) Settings.Global.DEVICE_PROVISIONED, 0))
&& ((state == NetworkInfo.State.CONNECTED) && (((state == NetworkInfo.State.CONNECTED)
|| info.isConnectedToProvisioningNetwork())) { && (info.getType() == ConnectivityManager.TYPE_MOBILE))
|| info.isConnectedToProvisioningNetwork())) {
log("ConnectivityChange checkMobileProvisioning for"
+ " TYPE_MOBILE or ProvisioningNetwork");
checkMobileProvisioning(CheckMp.MAX_TIMEOUT_MS); checkMobileProvisioning(CheckMp.MAX_TIMEOUT_MS);
} }