From c58d1f9688017d616e0ec8fb7a36ed3aadde6769 Mon Sep 17 00:00:00 2001 From: Rebecca Silberstein Date: Fri, 11 Aug 2017 08:30:12 -0700 Subject: WifiServiceImpl: fix logging of API calls With the default settings, WifiServiceImpl does not log messages about API calls. This CL changes the API calls from mLog.trace to mLog.info. Bug: 64542778 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Test: manually verified calls were logged with verbose logging off Change-Id: Ibb60305353b4ab4f072a09e3a68a8a3983fe666d --- .../com/android/server/wifi/WifiServiceImpl.java | 142 ++++++++++----------- 1 file changed, 71 insertions(+), 71 deletions(-) (limited to 'service') diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java index 6ef102066..6ef045591 100644 --- a/service/java/com/android/server/wifi/WifiServiceImpl.java +++ b/service/java/com/android/server/wifi/WifiServiceImpl.java @@ -591,7 +591,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public void startScan(ScanSettings settings, WorkSource workSource, String packageName) { enforceChangePermission(); - mLog.trace("startScan uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("startScan uid=%").c(Binder.getCallingUid()).flush(); // Check and throttle background apps for wifi scan. if (isRequestFromBackground(packageName)) { long lastScanMs = mLastScanTimestamps.getOrDefault(packageName, 0L); @@ -683,7 +683,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public String getCurrentNetworkWpsNfcConfigurationToken() { enforceConnectivityInternalPermission(); - mLog.trace("getCurrentNetworkWpsNfcConfigurationToken uid=%") + mLog.info("getCurrentNetworkWpsNfcConfigurationToken uid=%") .c(Binder.getCallingUid()).flush(); // TODO Add private logging for netId b/33807876 return mWifiStateMachine.syncGetCurrentNetworkWpsNfcConfigurationToken(); @@ -777,7 +777,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { enforceChangePermission(); Slog.d(TAG, "setWifiEnabled: " + enable + " pid=" + Binder.getCallingPid() + ", uid=" + Binder.getCallingUid() + ", package=" + packageName); - mLog.trace("setWifiEnabled package=% uid=% enable=%").c(packageName) + mLog.info("setWifiEnabled package=% uid=% enable=%").c(packageName) .c(Binder.getCallingUid()).c(enable).flush(); boolean isFromSettings = @@ -785,7 +785,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { // If Airplane mode is enabled, only Settings is allowed to toggle Wifi if (mSettingsStore.isAirplaneModeOn() && !isFromSettings) { - mLog.trace("setWifiEnabled in Airplane mode: only Settings can enable wifi").flush(); + mLog.info("setWifiEnabled in Airplane mode: only Settings can enable wifi").flush(); return false; } @@ -794,7 +794,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { mWifiStateMachine.syncGetWifiApState() != WifiManager.WIFI_AP_STATE_DISABLED; if (apEnabled && !isFromSettings) { - mLog.trace("setWifiEnabled SoftAp not disabled: only Settings can enable wifi").flush(); + mLog.info("setWifiEnabled SoftAp not disabled: only Settings can enable wifi").flush(); return false; } @@ -847,7 +847,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getWifiEnabledState() { enforceAccessPermission(); - mLog.trace("getWifiEnabledState uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getWifiEnabledState uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.syncGetWifiState(); } @@ -862,7 +862,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { enforceChangePermission(); mWifiPermissionsUtil.enforceTetherChangePermission(mContext); - mLog.trace("setWifiApEnabled uid=% enable=%").c(Binder.getCallingUid()).c(enabled).flush(); + mLog.info("setWifiApEnabled uid=% enable=%").c(Binder.getCallingUid()).c(enabled).flush(); if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) { throw new SecurityException("DISALLOW_CONFIG_TETHERING is enabled for this user."); @@ -888,7 +888,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getWifiApEnabledState() { enforceAccessPermission(); - mLog.trace("getWifiApEnabledState uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getWifiApEnabledState uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.syncGetWifiApState(); } @@ -963,7 +963,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { } break; default: - mLog.trace("updateInterfaceIpStateInternal: unknown mode %").c(mode).flush(); + mLog.warn("updateInterfaceIpStateInternal: unknown mode %").c(mode).flush(); } } } @@ -979,7 +979,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { // NETWORK_STACK is a signature only permission. enforceNetworkStackPermission(); - mLog.trace("startSoftAp uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("startSoftAp uid=%").c(Binder.getCallingUid()).flush(); synchronized (mLocalOnlyHotspotRequests) { // If a tethering request comes in while we have LOHS running (or requested), call stop @@ -1023,7 +1023,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { // only permitted callers are allowed to this point - they must have gone through // connectivity service since this method is protected with the NETWORK_STACK PERMISSION - mLog.trace("stopSoftAp uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("stopSoftAp uid=%").c(Binder.getCallingUid()).flush(); synchronized (mLocalOnlyHotspotRequests) { // If a tethering request comes in while we have LOHS running (or requested), call stop @@ -1212,17 +1212,17 @@ public class WifiServiceImpl extends IWifiManager.Stub { return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; } } catch (RemoteException e) { - mLog.trace("RemoteException during isAppForeground when calling startLOHS"); + mLog.warn("RemoteException during isAppForeground when calling startLOHS"); return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; } - mLog.trace("startLocalOnlyHotspot uid=% pid=%").c(uid).c(pid).flush(); + mLog.info("startLocalOnlyHotspot uid=% pid=%").c(uid).c(pid).flush(); synchronized (mLocalOnlyHotspotRequests) { // check if we are currently tethering if (mIfaceIpModes.contains(WifiManager.IFACE_IP_MODE_TETHERED)) { // Tethering is enabled, cannot start LocalOnlyHotspot - mLog.trace("Cannot start localOnlyHotspot when WiFi Tethering is active."); + mLog.info("Cannot start localOnlyHotspot when WiFi Tethering is active."); return LocalOnlyHotspotCallback.ERROR_INCOMPATIBLE_MODE; } @@ -1272,7 +1272,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { final int uid = Binder.getCallingUid(); final int pid = Binder.getCallingPid(); - mLog.trace("stopLocalOnlyHotspot uid=% pid=%").c(uid).c(pid).flush(); + mLog.info("stopLocalOnlyHotspot uid=% pid=%").c(uid).c(pid).flush(); synchronized (mLocalOnlyHotspotRequests) { // was the caller already registered? check request tracker - return false if not @@ -1360,7 +1360,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { throw new SecurityException("App not allowed to read or update stored WiFi Ap config " + "(uid = " + uid + ")"); } - mLog.trace("getWifiApConfiguration uid=%").c(uid).flush(); + mLog.info("getWifiApConfiguration uid=%").c(uid).flush(); return mWifiStateMachine.syncGetWifiApConfiguration(); } @@ -1379,7 +1379,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { throw new SecurityException("App not allowed to read or update stored WiFi AP config " + "(uid = " + uid + ")"); } - mLog.trace("setWifiApConfiguration uid=%").c(uid).flush(); + mLog.info("setWifiApConfiguration uid=%").c(uid).flush(); if (wifiConfig == null) return; if (isValid(wifiConfig)) { @@ -1395,7 +1395,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean isScanAlwaysAvailable() { enforceAccessPermission(); - mLog.trace("isScanAlwaysAvailable uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("isScanAlwaysAvailable uid=%").c(Binder.getCallingUid()).flush(); return mSettingsStore.isScanAlwaysAvailable(); } @@ -1405,7 +1405,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void disconnect() { enforceChangePermission(); - mLog.trace("disconnect uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("disconnect uid=%").c(Binder.getCallingUid()).flush(); mWifiStateMachine.disconnectCommand(); } @@ -1415,7 +1415,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void reconnect() { enforceChangePermission(); - mLog.trace("reconnect uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("reconnect uid=%").c(Binder.getCallingUid()).flush(); mWifiStateMachine.reconnectCommand(); } @@ -1425,7 +1425,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void reassociate() { enforceChangePermission(); - mLog.trace("reassociate uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("reassociate uid=%").c(Binder.getCallingUid()).flush(); mWifiStateMachine.reassociateCommand(); } @@ -1435,7 +1435,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getSupportedFeatures() { enforceAccessPermission(); - mLog.trace("getSupportedFeatures uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getSupportedFeatures uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncGetSupportedFeatures(mWifiStateMachineChannel); } else { @@ -1447,7 +1447,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void requestActivityInfo(ResultReceiver result) { Bundle bundle = new Bundle(); - mLog.trace("requestActivityInfo uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("requestActivityInfo uid=%").c(Binder.getCallingUid()).flush(); bundle.putParcelable(BatteryStats.RESULT_RECEIVER_CONTROLLER_KEY, reportActivityInfo()); result.send(0, bundle); } @@ -1458,7 +1458,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public WifiActivityEnergyInfo reportActivityInfo() { enforceAccessPermission(); - mLog.trace("reportActivityInfo uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("reportActivityInfo uid=%").c(Binder.getCallingUid()).flush(); if ((getSupportedFeatures() & WifiManager.WIFI_FEATURE_LINK_LAYER_STATS) == 0) { return null; } @@ -1531,7 +1531,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public ParceledListSlice getConfiguredNetworks() { enforceAccessPermission(); - mLog.trace("getConfiguredNetworks uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getConfiguredNetworks uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { List configs = mWifiStateMachine.syncGetConfiguredNetworks( Binder.getCallingUid(), mWifiStateMachineChannel); @@ -1552,7 +1552,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public ParceledListSlice getPrivilegedConfiguredNetworks() { enforceReadCredentialPermission(); enforceAccessPermission(); - mLog.trace("getPrivilegedConfiguredNetworks uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getPrivilegedConfiguredNetworks uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { List configs = mWifiStateMachine.syncGetPrivilegedConfiguredNetwork(mWifiStateMachineChannel); @@ -1574,7 +1574,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public WifiConfiguration getMatchingWifiConfig(ScanResult scanResult) { enforceAccessPermission(); - mLog.trace("getMatchingWifiConfig uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getMatchingWifiConfig uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1591,7 +1591,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public List getMatchingOsuProviders(ScanResult scanResult) { enforceAccessPermission(); - mLog.trace("getMatchingOsuProviders uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getMatchingOsuProviders uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1607,7 +1607,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int addOrUpdateNetwork(WifiConfiguration config) { enforceChangePermission(); - mLog.trace("addOrUpdateNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("addOrUpdateNetwork uid=%").c(Binder.getCallingUid()).flush(); // Previously, this API is overloaded for installing Passpoint profiles. Now // that we have a dedicated API for doing it, redirect the call to the dedicated API. @@ -1678,7 +1678,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean removeNetwork(int netId) { enforceChangePermission(); - mLog.trace("removeNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("removeNetwork uid=%").c(Binder.getCallingUid()).flush(); // TODO Add private logging for netId b/33807876 if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncRemoveNetwork(mWifiStateMachineChannel, netId); @@ -1699,7 +1699,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public boolean enableNetwork(int netId, boolean disableOthers) { enforceChangePermission(); // TODO b/33807876 Log netId - mLog.trace("enableNetwork uid=% disableOthers=%") + mLog.info("enableNetwork uid=% disableOthers=%") .c(Binder.getCallingUid()) .c(disableOthers).flush(); @@ -1722,7 +1722,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public boolean disableNetwork(int netId) { enforceChangePermission(); // TODO b/33807876 Log netId - mLog.trace("disableNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("disableNetwork uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncDisableNetwork(mWifiStateMachineChannel, netId); @@ -1739,7 +1739,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public WifiInfo getConnectionInfo(String callingPackage) { enforceAccessPermission(); - mLog.trace("getConnectionInfo uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getConnectionInfo uid=%").c(Binder.getCallingUid()).flush(); /* * Make sure we have the latest information, by sending * a status request to the supplicant. @@ -1780,7 +1780,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean addOrUpdatePasspointConfiguration(PasspointConfiguration config) { enforceChangePermission(); - mLog.trace("addorUpdatePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("addorUpdatePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1798,7 +1798,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean removePasspointConfiguration(String fqdn) { enforceChangePermission(); - mLog.trace("removePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("removePasspointConfiguration uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1816,7 +1816,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public List getPasspointConfigurations() { enforceAccessPermission(); - mLog.trace("getPasspointConfigurations uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getPasspointConfigurations uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1832,7 +1832,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void queryPasspointIcon(long bssid, String fileName) { enforceAccessPermission(); - mLog.trace("queryPasspointIcon uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("queryPasspointIcon uid=%").c(Binder.getCallingUid()).flush(); if (!mContext.getPackageManager().hasSystemFeature( PackageManager.FEATURE_WIFI_PASSPOINT)) { throw new UnsupportedOperationException("Passpoint not enabled"); @@ -1847,7 +1847,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { */ @Override public int matchProviderWithCurrentNetwork(String fqdn) { - mLog.trace("matchProviderWithCurrentNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("matchProviderWithCurrentNetwork uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.matchProviderWithCurrentNetwork(mWifiStateMachineChannel, fqdn); } @@ -1858,7 +1858,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { */ @Override public void deauthenticateNetwork(long holdoff, boolean ess) { - mLog.trace("deauthenticateNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("deauthenticateNetwork uid=%").c(Binder.getCallingUid()).flush(); mWifiStateMachine.deauthenticateNetwork(mWifiStateMachineChannel, holdoff, ess); } @@ -1871,7 +1871,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean saveConfiguration() { enforceChangePermission(); - mLog.trace("saveConfiguration uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("saveConfiguration uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncSaveConfig(mWifiStateMachineChannel); } else { @@ -1894,7 +1894,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { Slog.i(TAG, "WifiService trying to set country code to " + countryCode + " with persist set to " + persist); enforceConnectivityInternalPermission(); - mLog.trace("setCountryCode uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("setCountryCode uid=%").c(Binder.getCallingUid()).flush(); final long token = Binder.clearCallingIdentity(); mCountryCode.setCountryCode(countryCode); Binder.restoreCallingIdentity(token); @@ -1909,7 +1909,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public String getCountryCode() { enforceConnectivityInternalPermission(); - mLog.trace("getCountryCode uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getCountryCode uid=%").c(Binder.getCallingUid()).flush(); String country = mCountryCode.getCountryCode(); return country; } @@ -1917,7 +1917,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean isDualBandSupported() { //TODO: Should move towards adding a driver API that checks at runtime - mLog.trace("isDualBandSupported uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("isDualBandSupported uid=%").c(Binder.getCallingUid()).flush(); return mContext.getResources().getBoolean( com.android.internal.R.bool.config_wifi_dual_band_support); } @@ -1932,7 +1932,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Deprecated public DhcpInfo getDhcpInfo() { enforceAccessPermission(); - mLog.trace("getDhcpInfo uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getDhcpInfo uid=%").c(Binder.getCallingUid()).flush(); DhcpResults dhcpResults = mWifiStateMachine.syncGetDhcpResults(); DhcpInfo info = new DhcpInfo(); @@ -2045,7 +2045,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { if (remoteAddress == null) { throw new IllegalArgumentException("remoteAddress cannot be null"); } - mLog.trace("enableTdls uid=% enable=%").c(Binder.getCallingUid()).c(enable).flush(); + mLog.info("enableTdls uid=% enable=%").c(Binder.getCallingUid()).c(enable).flush(); TdlsTaskParams params = new TdlsTaskParams(); params.remoteIpAddress = remoteAddress; params.enable = enable; @@ -2055,7 +2055,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void enableTdlsWithMacAddress(String remoteMacAddress, boolean enable) { - mLog.trace("enableTdlsWithMacAddress uid=% enable=%") + mLog.info("enableTdlsWithMacAddress uid=% enable=%") .c(Binder.getCallingUid()) .c(enable) .flush(); @@ -2074,7 +2074,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public Messenger getWifiServiceMessenger() { enforceAccessPermission(); enforceChangePermission(); - mLog.trace("getWifiServiceMessenger uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getWifiServiceMessenger uid=%").c(Binder.getCallingUid()).flush(); return new Messenger(mClientHandler); } @@ -2085,7 +2085,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public void disableEphemeralNetwork(String SSID) { enforceAccessPermission(); enforceChangePermission(); - mLog.trace("disableEphemeralNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("disableEphemeralNetwork uid=%").c(Binder.getCallingUid()).flush(); mWifiStateMachine.disableEphemeralNetwork(SSID); } @@ -2321,7 +2321,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean acquireWifiLock(IBinder binder, int lockMode, String tag, WorkSource ws) { - mLog.trace("acquireWifiLock uid=% lockMode=%") + mLog.info("acquireWifiLock uid=% lockMode=%") .c(Binder.getCallingUid()) .c(lockMode).flush(); if (mWifiLockManager.acquireWifiLock(lockMode, tag, binder, ws)) { @@ -2333,13 +2333,13 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void updateWifiLockWorkSource(IBinder binder, WorkSource ws) { - mLog.trace("updateWifiLockWorkSource uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("updateWifiLockWorkSource uid=%").c(Binder.getCallingUid()).flush(); mWifiLockManager.updateWifiLockWorkSource(binder, ws); } @Override public boolean releaseWifiLock(IBinder binder) { - mLog.trace("releaseWifiLock uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("releaseWifiLock uid=%").c(Binder.getCallingUid()).flush(); if (mWifiLockManager.releaseWifiLock(binder)) { mWifiController.sendMessage(CMD_LOCKS_CHANGED); return true; @@ -2350,35 +2350,35 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void initializeMulticastFiltering() { enforceMulticastChangePermission(); - mLog.trace("initializeMulticastFiltering uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("initializeMulticastFiltering uid=%").c(Binder.getCallingUid()).flush(); mWifiMulticastLockManager.initializeFiltering(); } @Override public void acquireMulticastLock(IBinder binder, String tag) { enforceMulticastChangePermission(); - mLog.trace("acquireMulticastLock uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("acquireMulticastLock uid=%").c(Binder.getCallingUid()).flush(); mWifiMulticastLockManager.acquireLock(binder, tag); } @Override public void releaseMulticastLock() { enforceMulticastChangePermission(); - mLog.trace("releaseMulticastLock uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("releaseMulticastLock uid=%").c(Binder.getCallingUid()).flush(); mWifiMulticastLockManager.releaseLock(); } @Override public boolean isMulticastEnabled() { enforceAccessPermission(); - mLog.trace("isMulticastEnabled uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("isMulticastEnabled uid=%").c(Binder.getCallingUid()).flush(); return mWifiMulticastLockManager.isMulticastEnabled(); } @Override public void enableVerboseLogging(int verbose) { enforceAccessPermission(); - mLog.trace("enableVerboseLogging uid=% verbose=%") + mLog.info("enableVerboseLogging uid=% verbose=%") .c(Binder.getCallingUid()) .c(verbose).flush(); mFacade.setIntegerSetting( @@ -2398,7 +2398,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getVerboseLoggingLevel() { enforceAccessPermission(); - mLog.trace("getVerboseLoggingLevel uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getVerboseLoggingLevel uid=%").c(Binder.getCallingUid()).flush(); return mFacade.getIntegerSetting( mContext, Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED, 0); } @@ -2406,7 +2406,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void enableAggressiveHandover(int enabled) { enforceAccessPermission(); - mLog.trace("enableAggressiveHandover uid=% enabled=%") + mLog.info("enableAggressiveHandover uid=% enabled=%") .c(Binder.getCallingUid()) .c(enabled) .flush(); @@ -2416,14 +2416,14 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getAggressiveHandover() { enforceAccessPermission(); - mLog.trace("getAggressiveHandover uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getAggressiveHandover uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.getAggressiveHandover(); } @Override public void setAllowScansWithTraffic(int enabled) { enforceAccessPermission(); - mLog.trace("setAllowScansWithTraffic uid=% enabled=%") + mLog.info("setAllowScansWithTraffic uid=% enabled=%") .c(Binder.getCallingUid()) .c(enabled).flush(); mWifiStateMachine.setAllowScansWithTraffic(enabled); @@ -2432,14 +2432,14 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public int getAllowScansWithTraffic() { enforceAccessPermission(); - mLog.trace("getAllowScansWithTraffic uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getAllowScansWithTraffic uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.getAllowScansWithTraffic(); } @Override public boolean setEnableAutoJoinWhenAssociated(boolean enabled) { enforceChangePermission(); - mLog.trace("setEnableAutoJoinWhenAssociated uid=% enabled=%") + mLog.info("setEnableAutoJoinWhenAssociated uid=% enabled=%") .c(Binder.getCallingUid()) .c(enabled).flush(); return mWifiStateMachine.setEnableAutoJoinWhenAssociated(enabled); @@ -2448,7 +2448,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public boolean getEnableAutoJoinWhenAssociated() { enforceAccessPermission(); - mLog.trace("getEnableAutoJoinWhenAssociated uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getEnableAutoJoinWhenAssociated uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.getEnableAutoJoinWhenAssociated(); } @@ -2457,7 +2457,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { public WifiConnectionStatistics getConnectionStatistics() { enforceAccessPermission(); enforceReadCredentialPermission(); - mLog.trace("getConnectionStatistics uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getConnectionStatistics uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel != null) { return mWifiStateMachine.syncGetConnectionStatistics(mWifiStateMachineChannel); } else { @@ -2469,7 +2469,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void factoryReset() { enforceConnectivityInternalPermission(); - mLog.trace("factoryReset uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("factoryReset uid=%").c(Binder.getCallingUid()).flush(); if (mUserManager.hasUserRestriction(UserManager.DISALLOW_NETWORK_RESET)) { return; } @@ -2543,7 +2543,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public Network getCurrentNetwork() { enforceAccessPermission(); - mLog.trace("getCurrentNetwork uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("getCurrentNetwork uid=%").c(Binder.getCallingUid()).flush(); return mWifiStateMachine.getCurrentNetwork(); } @@ -2575,9 +2575,9 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void enableWifiConnectivityManager(boolean enabled) { enforceConnectivityInternalPermission(); - mLog.trace("enableWifiConnectivityManager uid=% enabled=%") - .c(Binder.getCallingUid()) - .c(enabled).flush(); + mLog.info("enableWifiConnectivityManager uid=% enabled=%") + .c(Binder.getCallingUid()) + .c(enabled).flush(); mWifiStateMachine.enableWifiConnectivityManager(enabled); } @@ -2589,7 +2589,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public byte[] retrieveBackupData() { enforceNetworkSettingsPermission(); - mLog.trace("retrieveBackupData uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("retrieveBackupData uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel == null) { Slog.e(TAG, "mWifiStateMachineChannel is not initialized"); return null; @@ -2634,7 +2634,7 @@ public class WifiServiceImpl extends IWifiManager.Stub { @Override public void restoreBackupData(byte[] data) { enforceNetworkSettingsPermission(); - mLog.trace("restoreBackupData uid=%").c(Binder.getCallingUid()).flush(); + mLog.info("restoreBackupData uid=%").c(Binder.getCallingUid()).flush(); if (mWifiStateMachineChannel == null) { Slog.e(TAG, "mWifiStateMachineChannel is not initialized"); return; -- cgit v1.2.3