Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'cf6185447188a53e42ca28a73fe667e375621565':
  Tighten condition for calling checkMobileProvisioning.
This commit is contained in:
Wink Saville
2013-09-14 11:23:28 -07:00
committed by Android Git Automerger
parent 96b82aae35 cf61854471
commit 8976e3473f
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())
&& (0 != Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0))
&& ((state == NetworkInfo.State.CONNECTED)
|| info.isConnectedToProvisioningNetwork())) {
&& (((state == NetworkInfo.State.CONNECTED)
&& (info.getType() == ConnectivityManager.TYPE_MOBILE))
|| info.isConnectedToProvisioningNetwork())) {
log("ConnectivityChange checkMobileProvisioning for"
+ " TYPE_MOBILE or ProvisioningNetwork");
checkMobileProvisioning(CheckMp.MAX_TIMEOUT_MS);
}