diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 5420ee2f11..00b27bf52c 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -170,7 +170,6 @@ import android.util.ArraySet; import android.util.LocalLog; import android.util.Log; import android.util.Pair; -import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; import android.util.Xml; @@ -1972,7 +1971,7 @@ public class ConnectivityService extends IConnectivityManager.Stub private void registerNetdEventCallback() { final IIpConnectivityMetrics ipConnectivityMetrics = mDeps.getIpConnectivityMetrics(); if (ipConnectivityMetrics == null) { - Slog.wtf(TAG, "Missing IIpConnectivityMetrics"); + Log.wtf(TAG, "Missing IIpConnectivityMetrics"); return; } @@ -2438,7 +2437,7 @@ public class ConnectivityService extends IConnectivityManager.Stub if (VDBG || DDBG) log("Setting MTU size: " + iface + ", " + mtu); mNetd.interfaceSetMtu(iface, mtu); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "exception in interfaceSetMtu()" + e); + loge("exception in interfaceSetMtu()" + e); } } @@ -2460,7 +2459,7 @@ public class ConnectivityService extends IConnectivityManager.Stub if (tcpBufferSizes.equals(mCurrentTcpBufferSizes)) return; try { - if (VDBG || DDBG) Slog.d(TAG, "Setting tx/rx TCP buffers to " + tcpBufferSizes); + if (VDBG || DDBG) log("Setting tx/rx TCP buffers to " + tcpBufferSizes); String rmemValues = String.join(" ", values[0], values[1], values[2]); String wmemValues = String.join(" ", values[3], values[4], values[5]); @@ -2761,7 +2760,7 @@ public class ConnectivityService extends IConnectivityManager.Stub case NetworkAgent.EVENT_NETWORK_CAPABILITIES_CHANGED: { NetworkCapabilities networkCapabilities = (NetworkCapabilities) msg.obj; if (networkCapabilities.hasConnectivityManagedCapability()) { - Slog.wtf(TAG, "BUG: " + nai + " has CS-managed capability."); + Log.wtf(TAG, "BUG: " + nai + " has CS-managed capability."); } if (networkCapabilities.hasTransport(TRANSPORT_TEST)) { // Make sure the original object is not mutated. NetworkAgent normally @@ -3066,7 +3065,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // Legacy version of notifyNetworkTestedWithExtras. // Would only be called if the system has a NetworkStack module older than the // framework, which does not happen in practice. - Slog.wtf(TAG, "Deprecated notifyNetworkTested called: no action taken"); + Log.wtf(TAG, "Deprecated notifyNetworkTested called: no action taken"); } @Override @@ -3543,7 +3542,7 @@ public class ConnectivityService extends IConnectivityManager.Stub numRequests = nai.numForegroundNetworkRequests(); break; default: - Slog.wtf(TAG, "Invalid reason. Cannot happen."); + Log.wtf(TAG, "Invalid reason. Cannot happen."); return true; } @@ -3705,7 +3704,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (mUidToNetworkRequestCount) { final int requests = mUidToNetworkRequestCount.get(nri.mUid, 0); if (requests < 1) { - Slog.wtf(TAG, "BUG: too small request count " + requests + " for UID " + nri.mUid); + Log.wtf(TAG, "BUG: too small request count " + requests + " for UID " + nri.mUid); } else if (requests == 1) { mUidToNetworkRequestCount.removeAt(mUidToNetworkRequestCount.indexOfKey(nri.mUid)); } else { @@ -3750,7 +3749,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } if (!nai.networkAgentConfig.explicitlySelected) { - Slog.wtf(TAG, "BUG: setAcceptUnvalidated non non-explicitly selected network"); + Log.wtf(TAG, "BUG: setAcceptUnvalidated non non-explicitly selected network"); } if (accept != nai.networkAgentConfig.acceptUnvalidated) { @@ -4020,7 +4019,7 @@ public class ConnectivityService extends IConnectivityManager.Stub highPriority = nai.networkAgentConfig.explicitlySelected; break; default: - Slog.wtf(TAG, "Unknown notification type " + type); + Log.wtf(TAG, "Unknown notification type " + type); return; } @@ -4342,7 +4341,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (this) { if (!mNetTransitionWakeLock.isHeld()) { mWakelockLogs.log(String.format("RELEASE: already released (%s)", event)); - Slog.w(TAG, "expected Net Transition WakeLock to be held"); + Log.w(TAG, "expected Net Transition WakeLock to be held"); return; } mNetTransitionWakeLock.release(); @@ -4514,7 +4513,7 @@ public class ConnectivityService extends IConnectivityManager.Stub @Override public void onChange(boolean selfChange) { - Slog.wtf(TAG, "Should never be reached."); + Log.wtf(TAG, "Should never be reached."); } @Override @@ -4529,15 +4528,19 @@ public class ConnectivityService extends IConnectivityManager.Stub } private static void log(String s) { - Slog.d(TAG, s); + Log.d(TAG, s); + } + + private static void logw(String s) { + Log.w(TAG, s); } private static void loge(String s) { - Slog.e(TAG, s); + Log.e(TAG, s); } private static void loge(String s, Throwable t) { - Slog.e(TAG, s, t); + Log.e(TAG, s, t); } /** @@ -4833,7 +4836,7 @@ public class ConnectivityService extends IConnectivityManager.Stub @Override public boolean updateLockdownVpn() { if (Binder.getCallingUid() != Process.SYSTEM_UID) { - Slog.w(TAG, "Lockdown VPN only available to AID_SYSTEM"); + logw("Lockdown VPN only available to AID_SYSTEM"); return false; } @@ -4843,21 +4846,21 @@ public class ConnectivityService extends IConnectivityManager.Stub if (mLockdownEnabled) { byte[] profileTag = mKeyStore.get(Credentials.LOCKDOWN_VPN); if (profileTag == null) { - Slog.e(TAG, "Lockdown VPN configured but cannot be read from keystore"); + loge("Lockdown VPN configured but cannot be read from keystore"); return false; } String profileName = new String(profileTag); final VpnProfile profile = VpnProfile.decode( profileName, mKeyStore.get(Credentials.VPN + profileName)); if (profile == null) { - Slog.e(TAG, "Lockdown VPN configured invalid profile " + profileName); + loge("Lockdown VPN configured invalid profile " + profileName); setLockdownTracker(null); return true; } int user = UserHandle.getUserId(Binder.getCallingUid()); Vpn vpn = mVpns.get(user); if (vpn == null) { - Slog.w(TAG, "VPN for user " + user + " not ready yet. Skipping lockdown"); + logw("VPN for user " + user + " not ready yet. Skipping lockdown"); return false; } setLockdownTracker(new LockdownVpnTracker(mContext, this, mHandler, vpn, profile)); @@ -4917,7 +4920,7 @@ public class ConnectivityService extends IConnectivityManager.Stub if (vpn == null) { // Shouldn't happen as all code paths that point here should have checked the Vpn // exists already. - Slog.wtf(TAG, "User " + userId + " has no Vpn configuration"); + Log.wtf(TAG, "User " + userId + " has no Vpn configuration"); return false; } @@ -4933,7 +4936,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (mVpns) { Vpn vpn = mVpns.get(userId); if (vpn == null) { - Slog.w(TAG, "User " + userId + " has no Vpn configuration"); + logw("User " + userId + " has no Vpn configuration"); return false; } return vpn.isAlwaysOnPackageSupported(packageName, mKeyStore); @@ -4954,7 +4957,7 @@ public class ConnectivityService extends IConnectivityManager.Stub Vpn vpn = mVpns.get(userId); if (vpn == null) { - Slog.w(TAG, "User " + userId + " has no Vpn configuration"); + logw("User " + userId + " has no Vpn configuration"); return false; } if (!vpn.setAlwaysOnPackage(packageName, lockdown, lockdownWhitelist, mKeyStore)) { @@ -4976,7 +4979,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (mVpns) { Vpn vpn = mVpns.get(userId); if (vpn == null) { - Slog.w(TAG, "User " + userId + " has no Vpn configuration"); + logw("User " + userId + " has no Vpn configuration"); return null; } return vpn.getAlwaysOnPackage(); @@ -4991,7 +4994,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (mVpns) { Vpn vpn = mVpns.get(userId); if (vpn == null) { - Slog.w(TAG, "User " + userId + " has no Vpn configuration"); + logw("User " + userId + " has no Vpn configuration"); return false; } return vpn.getLockdown(); @@ -5006,7 +5009,7 @@ public class ConnectivityService extends IConnectivityManager.Stub synchronized (mVpns) { Vpn vpn = mVpns.get(userId); if (vpn == null) { - Slog.w(TAG, "User " + userId + " has no Vpn configuration"); + logw("User " + userId + " has no Vpn configuration"); return null; } return vpn.getLockdownAllowlist(); @@ -5197,7 +5200,7 @@ public class ConnectivityService extends IConnectivityManager.Stub private void onPackageReplaced(String packageName, int uid) { if (TextUtils.isEmpty(packageName) || uid < 0) { - Slog.wtf(TAG, "Invalid package in onPackageReplaced: " + packageName + " | " + uid); + Log.wtf(TAG, "Invalid package in onPackageReplaced: " + packageName + " | " + uid); return; } final int userId = UserHandle.getUserId(uid); @@ -5208,7 +5211,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } // Legacy always-on VPN won't be affected since the package name is not set. if (TextUtils.equals(vpn.getAlwaysOnPackage(), packageName)) { - Slog.d(TAG, "Restarting always-on VPN package " + packageName + " for user " + log("Restarting always-on VPN package " + packageName + " for user " + userId); vpn.startAlwaysOnVpn(mKeyStore); } @@ -5217,7 +5220,7 @@ public class ConnectivityService extends IConnectivityManager.Stub private void onPackageRemoved(String packageName, int uid, boolean isReplacing) { if (TextUtils.isEmpty(packageName) || uid < 0) { - Slog.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid); + Log.wtf(TAG, "Invalid package in onPackageRemoved: " + packageName + " | " + uid); return; } @@ -5229,7 +5232,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } // Legacy always-on VPN won't be affected since the package name is not set. if (TextUtils.equals(vpn.getAlwaysOnPackage(), packageName) && !isReplacing) { - Slog.d(TAG, "Removing always-on VPN package " + packageName + " for user " + log("Removing always-on VPN package " + packageName + " for user " + userId); vpn.setAlwaysOnPackage(null, false, null, mKeyStore); } @@ -5845,7 +5848,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // Avoid creating duplicates. even if an app makes a direct AIDL call. // This will never happen if an app calls ConnectivityManager#registerNetworkProvider, // as that will throw if a duplicate provider is registered. - Slog.e(TAG, "Attempt to register existing NetworkProviderInfo " + loge("Attempt to register existing NetworkProviderInfo " + mNetworkProviderInfos.get(npi.messenger).name); return; } @@ -6402,7 +6405,7 @@ public class ConnectivityService extends IConnectivityManager.Stub // stop being matched by the updated agent. String diff = nai.networkCapabilities.describeImmutableDifferences(nc); if (!TextUtils.isEmpty(diff)) { - Slog.wtf(TAG, "BUG: " + nai + " lost immutable capabilities:" + diff); + Log.wtf(TAG, "BUG: " + nai + " lost immutable capabilities:" + diff); } } @@ -6962,7 +6965,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } newSatisfier.unlingerRequest(nri.request); if (!newSatisfier.addRequest(nri.request)) { - Slog.wtf(TAG, "BUG: " + newSatisfier.toShortString() + " already has " + Log.wtf(TAG, "BUG: " + newSatisfier.toShortString() + " already has " + nri.request); } } else { @@ -7310,7 +7313,7 @@ public class ConnectivityService extends IConnectivityManager.Stub networkAgent.everConnected = true; if (networkAgent.linkProperties == null) { - Slog.wtf(TAG, networkAgent.toShortString() + " connected with null LinkProperties"); + Log.wtf(TAG, networkAgent.toShortString() + " connected with null LinkProperties"); } // NetworkCapabilities need to be set before sending the private DNS config to diff --git a/services/core/java/com/android/server/connectivity/DnsManager.java b/services/core/java/com/android/server/connectivity/DnsManager.java index c789186564..1f0fb5e006 100644 --- a/services/core/java/com/android/server/connectivity/DnsManager.java +++ b/services/core/java/com/android/server/connectivity/DnsManager.java @@ -45,8 +45,8 @@ import android.os.ServiceSpecificException; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; +import android.util.Log; import android.util.Pair; -import android.util.Slog; import java.net.InetAddress; import java.util.Arrays; @@ -279,7 +279,7 @@ public class DnsManager { } public PrivateDnsConfig updatePrivateDns(Network network, PrivateDnsConfig cfg) { - Slog.w(TAG, "updatePrivateDns(" + network + ", " + cfg + ")"); + Log.w(TAG, "updatePrivateDns(" + network + ", " + cfg + ")"); return (cfg != null) ? mPrivateDnsMap.put(network.netId, cfg) : mPrivateDnsMap.remove(network.netId); @@ -389,7 +389,7 @@ public class DnsManager { mPrivateDnsValidationMap.remove(netId); } - Slog.d(TAG, String.format("sendDnsConfigurationForNetwork(%d, %s, %s, %d, %d, %d, %d, " + Log.d(TAG, String.format("sendDnsConfigurationForNetwork(%d, %s, %s, %d, %d, %d, %d, " + "%d, %d, %s, %s)", paramsParcel.netId, Arrays.toString(paramsParcel.servers), Arrays.toString(paramsParcel.domains), paramsParcel.sampleValiditySeconds, paramsParcel.successThreshold, paramsParcel.minSamples, @@ -400,7 +400,7 @@ public class DnsManager { try { mDnsResolver.setResolverConfiguration(paramsParcel); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error setting DNS configuration: " + e); + Log.e(TAG, "Error setting DNS configuration: " + e); return; } } @@ -431,8 +431,8 @@ public class DnsManager { DNS_RESOLVER_SAMPLE_VALIDITY_SECONDS, DNS_RESOLVER_DEFAULT_SAMPLE_VALIDITY_SECONDS); if (mSampleValidity < 0 || mSampleValidity > 65535) { - Slog.w(TAG, "Invalid sampleValidity=" + mSampleValidity + ", using default=" + - DNS_RESOLVER_DEFAULT_SAMPLE_VALIDITY_SECONDS); + Log.w(TAG, "Invalid sampleValidity=" + mSampleValidity + ", using default=" + + DNS_RESOLVER_DEFAULT_SAMPLE_VALIDITY_SECONDS); mSampleValidity = DNS_RESOLVER_DEFAULT_SAMPLE_VALIDITY_SECONDS; } @@ -440,17 +440,17 @@ public class DnsManager { DNS_RESOLVER_SUCCESS_THRESHOLD_PERCENT, DNS_RESOLVER_DEFAULT_SUCCESS_THRESHOLD_PERCENT); if (mSuccessThreshold < 0 || mSuccessThreshold > 100) { - Slog.w(TAG, "Invalid successThreshold=" + mSuccessThreshold + ", using default=" + - DNS_RESOLVER_DEFAULT_SUCCESS_THRESHOLD_PERCENT); + Log.w(TAG, "Invalid successThreshold=" + mSuccessThreshold + ", using default=" + + DNS_RESOLVER_DEFAULT_SUCCESS_THRESHOLD_PERCENT); mSuccessThreshold = DNS_RESOLVER_DEFAULT_SUCCESS_THRESHOLD_PERCENT; } mMinSamples = getIntSetting(DNS_RESOLVER_MIN_SAMPLES, DNS_RESOLVER_DEFAULT_MIN_SAMPLES); mMaxSamples = getIntSetting(DNS_RESOLVER_MAX_SAMPLES, DNS_RESOLVER_DEFAULT_MAX_SAMPLES); if (mMinSamples < 0 || mMinSamples > mMaxSamples || mMaxSamples > 64) { - Slog.w(TAG, "Invalid sample count (min, max)=(" + mMinSamples + ", " + mMaxSamples + - "), using default=(" + DNS_RESOLVER_DEFAULT_MIN_SAMPLES + ", " + - DNS_RESOLVER_DEFAULT_MAX_SAMPLES + ")"); + Log.w(TAG, "Invalid sample count (min, max)=(" + mMinSamples + ", " + mMaxSamples + + "), using default=(" + DNS_RESOLVER_DEFAULT_MIN_SAMPLES + ", " + + DNS_RESOLVER_DEFAULT_MAX_SAMPLES + ")"); mMinSamples = DNS_RESOLVER_DEFAULT_MIN_SAMPLES; mMaxSamples = DNS_RESOLVER_DEFAULT_MAX_SAMPLES; } diff --git a/services/core/java/com/android/server/connectivity/Nat464Xlat.java b/services/core/java/com/android/server/connectivity/Nat464Xlat.java index 163788f4a4..d9c2e80aad 100644 --- a/services/core/java/com/android/server/connectivity/Nat464Xlat.java +++ b/services/core/java/com/android/server/connectivity/Nat464Xlat.java @@ -30,7 +30,7 @@ import android.net.RouteInfo; import android.os.INetworkManagementService; import android.os.RemoteException; import android.os.ServiceSpecificException; -import android.util.Slog; +import android.util.Log; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.util.ArrayUtils; @@ -176,7 +176,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mNMService.registerObserver(this); } catch (RemoteException e) { - Slog.e(TAG, "Can't register iface observer for clat on " + mNetwork.toShortString()); + Log.e(TAG, "Can't register iface observer for clat on " + mNetwork.toShortString()); return; } @@ -185,7 +185,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { addrStr = mNetd.clatdStart(baseIface, mNat64PrefixInUse.toString()); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error starting clatd on " + baseIface + ": " + e); + Log.e(TAG, "Error starting clatd on " + baseIface + ": " + e); } mIface = CLAT_PREFIX + baseIface; mBaseIface = baseIface; @@ -193,7 +193,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mIPv6Address = (Inet6Address) InetAddresses.parseNumericAddress(addrStr); } catch (ClassCastException | IllegalArgumentException | NullPointerException e) { - Slog.e(TAG, "Invalid IPv6 address " + addrStr); + Log.e(TAG, "Invalid IPv6 address " + addrStr); } if (mPrefixDiscoveryRunning && !isPrefixDiscoveryNeeded()) { stopPrefixDiscovery(); @@ -218,7 +218,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mNMService.unregisterObserver(this); } catch (RemoteException | IllegalStateException e) { - Slog.e(TAG, "Error unregistering clatd observer on " + mBaseIface + ": " + e); + Log.e(TAG, "Error unregistering clatd observer on " + mBaseIface + ": " + e); } mNat64PrefixInUse = null; mIface = null; @@ -242,37 +242,37 @@ public class Nat464Xlat extends BaseNetworkObserver { @VisibleForTesting protected void start() { if (isStarted()) { - Slog.e(TAG, "startClat: already started"); + Log.e(TAG, "startClat: already started"); return; } if (mNetwork.linkProperties == null) { - Slog.e(TAG, "startClat: Can't start clat with null LinkProperties"); + Log.e(TAG, "startClat: Can't start clat with null LinkProperties"); return; } String baseIface = mNetwork.linkProperties.getInterfaceName(); if (baseIface == null) { - Slog.e(TAG, "startClat: Can't start clat on null interface"); + Log.e(TAG, "startClat: Can't start clat on null interface"); return; } // TODO: should we only do this if mNetd.clatdStart() succeeds? - Slog.i(TAG, "Starting clatd on " + baseIface); + Log.i(TAG, "Starting clatd on " + baseIface); enterStartingState(baseIface); } @VisibleForTesting protected void stop() { if (!isStarted()) { - Slog.e(TAG, "stopClat: already stopped"); + Log.e(TAG, "stopClat: already stopped"); return; } - Slog.i(TAG, "Stopping clatd on " + mBaseIface); + Log.i(TAG, "Stopping clatd on " + mBaseIface); try { mNetd.clatdStop(mBaseIface); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error stopping clatd on " + mBaseIface + ": " + e); + Log.e(TAG, "Error stopping clatd on " + mBaseIface + ": " + e); } String iface = mIface; @@ -294,7 +294,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mDnsResolver.startPrefix64Discovery(getNetId()); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error starting prefix discovery on netId " + getNetId() + ": " + e); + Log.e(TAG, "Error starting prefix discovery on netId " + getNetId() + ": " + e); } mPrefixDiscoveryRunning = true; } @@ -303,7 +303,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mDnsResolver.stopPrefix64Discovery(getNetId()); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error stopping prefix discovery on netId " + getNetId() + ": " + e); + Log.e(TAG, "Error stopping prefix discovery on netId " + getNetId() + ": " + e); } mPrefixDiscoveryRunning = false; } @@ -320,7 +320,7 @@ public class Nat464Xlat extends BaseNetworkObserver { try { mDnsResolver.setPrefix64(getNetId(), prefixString); } catch (RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error setting NAT64 prefix on netId " + getNetId() + " to " + Log.e(TAG, "Error setting NAT64 prefix on netId " + getNetId() + " to " + prefix + ": " + e); } } @@ -328,7 +328,7 @@ public class Nat464Xlat extends BaseNetworkObserver { private void maybeHandleNat64PrefixChange() { final IpPrefix newPrefix = selectNat64Prefix(); if (!Objects.equals(mNat64PrefixInUse, newPrefix)) { - Slog.d(TAG, "NAT64 prefix changed from " + mNat64PrefixInUse + " to " + Log.d(TAG, "NAT64 prefix changed from " + mNat64PrefixInUse + " to " + newPrefix); stop(); // It's safe to call update here, even though this method is called from update, because @@ -418,7 +418,7 @@ public class Nat464Xlat extends BaseNetworkObserver { return; } - Slog.d(TAG, "clatd running, updating NAI for " + mIface); + Log.d(TAG, "clatd running, updating NAI for " + mIface); for (LinkProperties stacked: oldLp.getStackedLinks()) { if (Objects.equals(mIface, stacked.getInterfaceName())) { lp.addStackedLink(stacked); @@ -451,7 +451,7 @@ public class Nat464Xlat extends BaseNetworkObserver { return new LinkAddress( InetAddresses.parseNumericAddress(config.ipv4Addr), config.prefixLength); } catch (IllegalArgumentException | RemoteException | ServiceSpecificException e) { - Slog.e(TAG, "Error getting link properties: " + e); + Log.e(TAG, "Error getting link properties: " + e); return null; } } @@ -480,11 +480,11 @@ public class Nat464Xlat extends BaseNetworkObserver { LinkAddress clatAddress = getLinkAddress(iface); if (clatAddress == null) { - Slog.e(TAG, "clatAddress was null for stacked iface " + iface); + Log.e(TAG, "clatAddress was null for stacked iface " + iface); return; } - Slog.i(TAG, String.format("interface %s is up, adding stacked link %s on top of %s", + Log.i(TAG, String.format("interface %s is up, adding stacked link %s on top of %s", mIface, mIface, mBaseIface)); enterRunningState(); LinkProperties lp = new LinkProperties(mNetwork.linkProperties); @@ -503,7 +503,7 @@ public class Nat464Xlat extends BaseNetworkObserver { return; } - Slog.i(TAG, "interface " + iface + " removed"); + Log.i(TAG, "interface " + iface + " removed"); // If we're running, and the interface was removed, then we didn't call stop(), and it's // likely that clatd crashed. Ensure we call stop() so we can start clatd again. Calling // stop() will also update LinkProperties, and if clatd crashed, the LinkProperties update diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 7f4fb4039d..7795ed38a7 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -35,7 +35,7 @@ import android.os.UserHandle; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import android.text.TextUtils; -import android.util.Slog; +import android.util.Log; import android.util.SparseArray; import android.util.SparseIntArray; import android.widget.Toast; @@ -175,7 +175,7 @@ public class NetworkNotificationManager { final int previousEventId = mNotificationTypeMap.get(id); final NotificationType previousNotifyType = NotificationType.getFromId(previousEventId); if (priority(previousNotifyType) > priority(notifyType)) { - Slog.d(TAG, String.format( + Log.d(TAG, String.format( "ignoring notification %s for network %s with existing notification %s", notifyType, id, previousNotifyType)); return; @@ -183,7 +183,7 @@ public class NetworkNotificationManager { clearNotification(id); if (DBG) { - Slog.d(TAG, String.format( + Log.d(TAG, String.format( "showNotification tag=%s event=%s transport=%s name=%s highPriority=%s", tag, nameOf(eventId), getTransportName(transportType), name, highPriority)); } @@ -253,7 +253,7 @@ public class NetworkNotificationManager { // are sent, but they are not implemented yet. return; } else { - Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport " + Log.wtf(TAG, "Unknown notification type " + notifyType + " on network transport " + getTransportName(transportType)); return; } @@ -294,7 +294,7 @@ public class NetworkNotificationManager { try { mNotificationManager.notify(tag, eventId, notification); } catch (NullPointerException npe) { - Slog.d(TAG, "setNotificationVisible: visible notificationManager error", npe); + Log.d(TAG, "setNotificationVisible: visible notificationManager error", npe); } } @@ -317,13 +317,13 @@ public class NetworkNotificationManager { final String tag = tagFor(id); final int eventId = mNotificationTypeMap.get(id); if (DBG) { - Slog.d(TAG, String.format("clearing notification tag=%s event=%s", tag, + Log.d(TAG, String.format("clearing notification tag=%s event=%s", tag, nameOf(eventId))); } try { mNotificationManager.cancel(tag, eventId); } catch (NullPointerException npe) { - Slog.d(TAG, String.format( + Log.d(TAG, String.format( "failed to clear notification tag=%s event=%s", tag, nameOf(eventId)), npe); } mNotificationTypeMap.delete(id); diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java index 26cc3ee165..5cb3d94a92 100644 --- a/services/core/java/com/android/server/connectivity/ProxyTracker.java +++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java @@ -35,7 +35,7 @@ import android.os.Handler; import android.os.UserHandle; import android.provider.Settings; import android.text.TextUtils; -import android.util.Slog; +import android.util.Log; import com.android.internal.annotations.GuardedBy; @@ -168,7 +168,7 @@ public class ProxyTracker { proxyProperties = new ProxyInfo(host, port, exclList); } if (!proxyProperties.isValid()) { - if (DBG) Slog.d(TAG, "Invalid proxy properties, ignoring: " + proxyProperties); + if (DBG) Log.d(TAG, "Invalid proxy properties, ignoring: " + proxyProperties); return; } @@ -223,7 +223,7 @@ public class ProxyTracker { if (mPacManager.setCurrentProxyScriptUrl(proxyInfo) == PacManager.DONT_SEND_BROADCAST) { return; } - if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo); + if (DBG) Log.d(TAG, "sending Proxy Broadcast for " + proxyInfo); Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); @@ -255,7 +255,7 @@ public class ProxyTracker { if (proxyInfo != null && (!TextUtils.isEmpty(proxyInfo.getHost()) || !Uri.EMPTY.equals(proxyInfo.getPacFileUrl()))) { if (!proxyInfo.isValid()) { - if (DBG) Slog.d(TAG, "Invalid proxy properties, ignoring: " + proxyInfo); + if (DBG) Log.d(TAG, "Invalid proxy properties, ignoring: " + proxyInfo); return; } mGlobalProxy = new ProxyInfo(proxyInfo); @@ -296,7 +296,7 @@ public class ProxyTracker { synchronized (mProxyLock) { if (Objects.equals(mDefaultProxy, proxyInfo)) return; if (proxyInfo != null && !proxyInfo.isValid()) { - if (DBG) Slog.d(TAG, "Invalid proxy properties, ignoring: " + proxyInfo); + if (DBG) Log.d(TAG, "Invalid proxy properties, ignoring: " + proxyInfo); return; }