diff options
| -rw-r--r-- | core/java/android/net/MobileDataStateTracker.java | 36 | ||||
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 75 |
2 files changed, 57 insertions, 54 deletions
diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index 73365502525b..5501f38b0fe6 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -119,22 +119,22 @@ public class MobileDataStateTracker implements NetworkStateTracker { switch (msg.what) { case AsyncChannel.CMD_CHANNEL_HALF_CONNECTED: if (msg.arg1 == AsyncChannel.STATUS_SUCCESSFUL) { - if (DBG) { + if (VDBG) { mMdst.log("MdstHandler connected"); } mMdst.mDataConnectionTrackerAc = (AsyncChannel) msg.obj; } else { - if (DBG) { + if (VDBG) { mMdst.log("MdstHandler %s NOT connected error=" + msg.arg1); } } break; case AsyncChannel.CMD_CHANNEL_DISCONNECTED: - mMdst.log("Disconnected from DataStateTracker"); + if (VDBG) mMdst.log("Disconnected from DataStateTracker"); mMdst.mDataConnectionTrackerAc = null; break; default: { - mMdst.log("Ignorning unknown message=" + msg); + if (VDBG) mMdst.log("Ignorning unknown message=" + msg); break; } } @@ -221,13 +221,13 @@ public class MobileDataStateTracker implements NetworkStateTracker { mLinkProperties = intent.getParcelableExtra( Phone.DATA_LINK_PROPERTIES_KEY); if (mLinkProperties == null) { - log("CONNECTED event did not supply link properties."); + loge("CONNECTED event did not supply link properties."); mLinkProperties = new LinkProperties(); } mLinkCapabilities = intent.getParcelableExtra( Phone.DATA_LINK_CAPABILITIES_KEY); if (mLinkCapabilities == null) { - log("CONNECTED event did not supply link capabilities."); + loge("CONNECTED event did not supply link capabilities."); mLinkCapabilities = new LinkCapabilities(); } setDetailedState(DetailedState.CONNECTED, reason, apnName); @@ -238,7 +238,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { if (TextUtils.equals(reason, Phone.REASON_LINK_PROPERTIES_CHANGED)) { mLinkProperties = intent.getParcelableExtra(Phone.DATA_LINK_PROPERTIES_KEY); if (mLinkProperties == null) { - log("No link property in LINK_PROPERTIES change event."); + loge("No link property in LINK_PROPERTIES change event."); mLinkProperties = new LinkProperties(); } // Just update reason field in this NetworkInfo @@ -269,7 +269,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { setDetailedState(DetailedState.FAILED, reason, apnName); } else if (intent.getAction(). equals(DataConnectionTracker.ACTION_DATA_CONNECTION_TRACKER_MESSENGER)) { - if (DBG) log(mApnType + " got ACTION_DATA_CONNECTION_TRACKER_MESSENGER"); + if (VDBG) log(mApnType + " got ACTION_DATA_CONNECTION_TRACKER_MESSENGER"); mMessenger = intent.getParcelableExtra(DataConnectionTracker.EXTRA_MESSENGER); AsyncChannel ac = new AsyncChannel(); ac.connect(mContext, MobileDataStateTracker.this.mHandler, mMessenger); @@ -437,7 +437,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { */ for (int retry = 0; retry < 2; retry++) { if (mPhoneService == null) { - log("Ignoring mobile radio request because could not acquire PhoneService"); + loge("Ignoring mobile radio request because could not acquire PhoneService"); break; } @@ -448,7 +448,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { } } - log("Could not set radio power to " + (turnOn ? "on" : "off")); + loge("Could not set radio power to " + (turnOn ? "on" : "off")); return false; } @@ -457,12 +457,12 @@ public class MobileDataStateTracker implements NetworkStateTracker { */ public void setDataEnable(boolean enabled) { try { - log("setDataEnable: E enabled=" + enabled); + if (DBG) log("setDataEnable: E enabled=" + enabled); mDataConnectionTrackerAc.sendMessage(DataConnectionTracker.CMD_SET_DATA_ENABLE, enabled ? DataConnectionTracker.ENABLED : DataConnectionTracker.DISABLED); - log("setDataEnable: X enabled=" + enabled); + if (VDBG) log("setDataEnable: X enabled=" + enabled); } catch (Exception e) { - log("setDataEnable: X mAc was null" + e); + loge("setDataEnable: X mAc was null" + e); } } @@ -473,15 +473,15 @@ public class MobileDataStateTracker implements NetworkStateTracker { public void setDependencyMet(boolean met) { Bundle bundle = Bundle.forPair(DataConnectionTracker.APN_TYPE_KEY, mApnType); try { - log("setDependencyMet: E met=" + met); + if (DBG) log("setDependencyMet: E met=" + met); Message msg = Message.obtain(); msg.what = DataConnectionTracker.CMD_SET_DEPENDENCY_MET; msg.arg1 = (met ? DataConnectionTracker.ENABLED : DataConnectionTracker.DISABLED); msg.setData(bundle); mDataConnectionTrackerAc.sendMessage(msg); - log("setDependencyMet: X met=" + met); + if (VDBG) log("setDependencyMet: X met=" + met); } catch (NullPointerException e) { - log("setDependencyMet: X mAc was null" + e); + loge("setDependencyMet: X mAc was null" + e); } } @@ -508,7 +508,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { */ for (int retry = 0; retry < 2; retry++) { if (mPhoneService == null) { - log("Ignoring feature request because could not acquire PhoneService"); + loge("Ignoring feature request because could not acquire PhoneService"); break; } @@ -523,7 +523,7 @@ public class MobileDataStateTracker implements NetworkStateTracker { } } - log("Could not " + (enable ? "enable" : "disable") + " APN type \"" + apnType + "\""); + loge("Could not " + (enable ? "enable" : "disable") + " APN type \"" + apnType + "\""); return Phone.APN_REQUEST_FAILED; } diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 541a8cfdb299..1bbe9343d6eb 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -344,7 +344,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mPolicyManager.registerListener(mPolicyListener); } catch (RemoteException e) { // ouch, no rules updates means some processes may never get network - Slog.e(TAG, "unable to register INetworkPolicyListener", e); + loge("unable to register INetworkPolicyListener" + e.toString()); } final PowerManager powerManager = (PowerManager) context.getSystemService( @@ -798,9 +798,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { } public void expire() { - log("ConnectivityService FeatureUser expire(" + - mNetworkType + ", " + mFeature + ", " + mBinder +"), created " + - (System.currentTimeMillis() - mCreateTime) + " mSec ago"); + if (VDBG) { + log("ConnectivityService FeatureUser expire(" + + mNetworkType + ", " + mFeature + ", " + mBinder +"), created " + + (System.currentTimeMillis() - mCreateTime) + " mSec ago"); + } stopUsingNetworkFeature(this, false); } @@ -843,7 +845,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { if(networkType == ConnectivityManager.TYPE_MOBILE) { usedNetworkType = convertFeatureToNetworkType(feature); if (usedNetworkType < 0) { - Slog.e(TAG, "Can't match any netTracker!"); + loge("Can't match any netTracker!"); usedNetworkType = networkType; } } @@ -953,7 +955,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { return stopUsingNetworkFeature(u, true); } else { // none found! - if (DBG) log("ignoring stopUsingNetworkFeature - not a live request"); + if (VDBG) log("ignoring stopUsingNetworkFeature - not a live request"); return 1; } } @@ -1081,7 +1083,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (tracker == null || !tracker.getNetworkInfo().isConnected() || tracker.isTeardownRequested()) { - if (DBG) { + if (VDBG) { log("requestRouteToHostAddress on down network " + "(" + networkType + ") - dropped"); } @@ -1152,13 +1154,13 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } if (doAdd) { - if (DBG) log("Adding " + r + " for interface " + ifaceName); + if (VDBG) log("Adding " + r + " for interface " + ifaceName); mAddedRoutes.add(r); try { mNetd.addRoute(ifaceName, r); } catch (Exception e) { // never crash - catch them all - loge("Exception trying to add a route: " + e); + if (VDBG) loge("Exception trying to add a route: " + e); return false; } } else { @@ -1166,16 +1168,16 @@ public class ConnectivityService extends IConnectivityManager.Stub { // we can remove it from the table mAddedRoutes.remove(r); if (mAddedRoutes.contains(r) == false) { - if (DBG) log("Removing " + r + " for interface " + ifaceName); + if (VDBG) log("Removing " + r + " for interface " + ifaceName); try { mNetd.removeRoute(ifaceName, r); } catch (Exception e) { // never crash - catch them all - loge("Exception trying to remove a route: " + e); + if (VDBG) loge("Exception trying to remove a route: " + e); return false; } } else { - if (DBG) log("not removing " + r + " as it's still in use"); + if (VDBG) log("not removing " + r + " as it's still in use"); } } return true; @@ -1220,7 +1222,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { enforceAccessPermission(); boolean retVal = Settings.Secure.getInt(mContext.getContentResolver(), Settings.Secure.MOBILE_DATA, 1) == 1; - if (DBG) log("getMobileDataEnabled returning " + retVal); + if (VDBG) log("getMobileDataEnabled returning " + retVal); return retVal; } @@ -1247,7 +1249,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); if (LOGD_RULES) { - Slog.d(TAG, "onUidRulesChanged(uid=" + uid + ", uidRules=" + uidRules + ")"); + log("onUidRulesChanged(uid=" + uid + ", uidRules=" + uidRules + ")"); } synchronized (mRulesLock) { @@ -1268,8 +1270,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mContext.enforceCallingOrSelfPermission(MANAGE_NETWORK_POLICY, TAG); if (LOGD_RULES) { - Slog.d(TAG, - "onMeteredIfacesChanged(ifaces=" + Arrays.toString(meteredIfaces) + ")"); + log("onMeteredIfacesChanged(ifaces=" + Arrays.toString(meteredIfaces) + ")"); } synchronized (mRulesLock) { @@ -1294,8 +1295,8 @@ public class ConnectivityService extends IConnectivityManager.Stub { private void handleSetMobileData(boolean enabled) { if (mNetTrackers[ConnectivityManager.TYPE_MOBILE] != null) { - if (DBG) { - Slog.d(TAG, mNetTrackers[ConnectivityManager.TYPE_MOBILE].toString() + enabled); + if (VDBG) { + log(mNetTrackers[ConnectivityManager.TYPE_MOBILE].toString() + enabled); } mNetTrackers[ConnectivityManager.TYPE_MOBILE].setDataEnable(enabled); } @@ -1587,7 +1588,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mNetConfigs[type].priority) || mNetworkPreference == mActiveDefaultNetwork) { // don't accept this one - if (DBG) { + if (VDBG) { log("Not broadcasting CONNECT_ACTION " + "to torn down network " + info.getTypeName()); } @@ -1688,9 +1689,11 @@ public class ConnectivityService extends IConnectivityManager.Stub { } } else { resetMask = NetworkUtils.RESET_ALL_ADDRESSES; - log("handleConnectivityChange: interface not not equivalent reset both" + - " linkProperty[" + netType + "]:" + - " resetMask=" + resetMask); + if (DBG) { + log("handleConnectivityChange: interface not not equivalent reset both" + + " linkProperty[" + netType + "]:" + + " resetMask=" + resetMask); + } } } if (mNetConfigs[netType].isDefault()) { @@ -1798,7 +1801,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { String bufferSizes = SystemProperties.get(key); if (bufferSizes.length() == 0) { - loge(key + " not found in system properties. Using defaults"); + if (VDBG) log(key + " not found in system properties. Using defaults"); // Setting to default values so we won't be stuck to previous values key = "net.tcp.buffersize.default"; @@ -1807,7 +1810,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { // Set values in kernel if (bufferSizes.length() != 0) { - if (DBG) { + if (VDBG) { log("Setting TCP values: [" + bufferSizes + "] which comes from [" + key + "]"); } @@ -1849,7 +1852,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { */ private void reassessPidDns(int myPid, boolean doBump) { - if (DBG) log("reassessPidDns for pid " + myPid); + if (VDBG) log("reassessPidDns for pid " + myPid); for(int i : mPriorityList) { if (mNetConfigs[i].isDefault()) { continue; @@ -1935,7 +1938,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { String value = mDefaultDns.getHostAddress(); if (!value.equals(SystemProperties.get("net.dns1"))) { if (DBG) { - log("no dns provided for " + network + " - using " + value); + loge("no dns provided for " + network + " - using " + value); } changed = true; SystemProperties.set("net.dns1", value); @@ -1948,7 +1951,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { if (!changed && value.equals(SystemProperties.get(key))) { continue; } - if (DBG) { + if (VDBG) { log("adding dns " + value + " for " + network); } changed = true; @@ -1957,7 +1960,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { } for (int i = last + 1; i <= mNumDnsEntries; ++i) { String key = "net.dns" + i; - if (DBG) log("erasing " + key); + if (VDBG) log("erasing " + key); changed = true; SystemProperties.set(key, ""); } @@ -1968,7 +1971,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mNetd.setDnsServersForInterface(iface, NetworkUtils.makeStrings(dnses)); mNetd.setDefaultInterfaceForDns(iface); } catch (Exception e) { - Slog.e(TAG, "exception setting default dns interface: " + e); + loge("exception setting default dns interface: " + e); } } if (!domains.equals(SystemProperties.get("net.dns.search"))) { @@ -1998,7 +2001,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mNetd.setDnsServersForInterface(p.getInterfaceName(), NetworkUtils.makeStrings(dnses)); } catch (Exception e) { - Slog.e(TAG, "exception setting dns servers: " + e); + loge("exception setting dns servers: " + e); } // set per-pid dns for attached secondary nets List pids = mNetRequestersPids[netType]; @@ -2335,7 +2338,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { // 100 percent is full good, 0 is full bad. public void reportInetCondition(int networkType, int percentage) { - if (DBG) log("reportNetworkCondition(" + networkType + ", " + percentage + ")"); + if (VDBG) log("reportNetworkCondition(" + networkType + ", " + percentage + ")"); mContext.enforceCallingOrSelfPermission( android.Manifest.permission.STATUS_BAR, "ConnectivityService"); @@ -2372,7 +2375,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mDefaultInetCondition = condition; int delay; if (mInetConditionChangeInFlight == false) { - if (DBG) log("starting a change hold"); + if (VDBG) log("starting a change hold"); // setup a new hold to debounce this if (mDefaultInetCondition > 50) { delay = Settings.Secure.getInt(mContext.getContentResolver(), @@ -2387,12 +2390,12 @@ public class ConnectivityService extends IConnectivityManager.Stub { } else { // we've set the new condition, when this hold ends that will get // picked up - if (DBG) log("currently in hold - not setting new end evt"); + if (VDBG) log("currently in hold - not setting new end evt"); } } private void handleInetConditionHoldEnd(int netType, int sequence) { - if (DBG) { + if (VDBG) { log("Inet hold end, net=" + netType + ", condition =" + mDefaultInetCondition + ", published condition =" + mDefaultInetConditionPublished); @@ -2490,7 +2493,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { mDefaultProxy = null; } } - if (DBG) log("changing default proxy to " + proxy); + if (VDBG) log("changing default proxy to " + proxy); if ((proxy == null && mGlobalProxy == null) || proxy.equals(mGlobalProxy)) return; if (mGlobalProxy != null) return; sendProxyBroadcast(proxy); @@ -2517,7 +2520,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { private void sendProxyBroadcast(ProxyProperties proxy) { if (proxy == null) proxy = new ProxyProperties("", 0, ""); - log("sending Proxy Broadcast for " + proxy); + if (DBG) log("sending Proxy Broadcast for " + proxy); Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); |