Merge "Rename WifiManager.enableVerboseLogging/getVerboseLoggingLevel" (e32def91) · Commits · e / os / android_frameworks_base

api/system-current.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -7604,7 +7604,6 @@ package android.net.wifi {
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void connect(int, @Nullable android.net.wifi.WifiManager.ActionListener);
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void disable(int, @Nullable android.net.wifi.WifiManager.ActionListener);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK}) public void disableEphemeralNetwork(@NonNull String);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void enableVerboseLogging(int);
		method @RequiresPermission(android.Manifest.permission.CONNECTIVITY_INTERNAL) public void factoryReset();
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void forget(int, @Nullable android.net.wifi.WifiManager.ActionListener);
		method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.util.Pair<android.net.wifi.WifiConfiguration,java.util.Map<java.lang.Integer,java.util.List<android.net.wifi.ScanResult>>>> getAllMatchingWifiConfigs(@NonNull java.util.List<android.net.wifi.ScanResult>);
		@@ -7616,7 +7615,6 @@ package android.net.wifi {
		method @NonNull @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.Map<android.net.wifi.WifiNetworkSuggestion,java.util.List<android.net.wifi.ScanResult>> getMatchingScanResults(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>, @Nullable java.util.List<android.net.wifi.ScanResult>);
		method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.READ_WIFI_CREDENTIAL}) public java.util.List<android.net.wifi.WifiConfiguration> getPrivilegedConfiguredNetworks();
		method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.SoftApConfiguration getSoftApConfiguration();
		method public int getVerboseLoggingLevel();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void getWifiActivityEnergyInfoAsync(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.OnWifiActivityEnergyInfoListener);
		method @Deprecated @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.WifiConfiguration getWifiApConfiguration();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getWifiApState();
		@@ -7626,6 +7624,7 @@ package android.net.wifi {
		method @Deprecated public boolean isDeviceToDeviceRttSupported();
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean isDualModeSupported();
		method public boolean isPortableHotspotSupported();
		method public boolean isVerboseLoggingEnabled();
		method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiApEnabled();
		method public boolean isWifiScannerSupported();
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void registerNetworkRequestMatchCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.NetworkRequestMatchCallback);
		@@ -7642,6 +7641,7 @@ package android.net.wifi {
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMacRandomizationSettingPasspointEnabled(@NonNull String, boolean);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMeteredOverridePasspoint(@NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean setSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);
		method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setVerboseLoggingEnabled(boolean);
		method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
		method @RequiresPermission(android.Manifest.permission.WIFI_UPDATE_USABILITY_STATS_SCORE) public boolean setWifiConnectedNetworkScorer(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.WifiConnectedNetworkScorer);
		method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public void startEasyConnectAsConfiguratorInitiator(@NonNull String, int, int, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.EasyConnectStatusCallback);

core/tests/hosttests/test-apps/DownloadManagerTestApp/src/com/android/frameworks/downloadmanagertests/DownloadManagerTestRunner.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ public class DownloadManagerTestRunner extends InstrumentationTestRunner {
		}
		// enable verbose wifi logging
		((WifiManager)getContext().getSystemService(Context.WIFI_SERVICE))
		.enableVerboseLogging(1);
		.setVerboseLoggingEnabled(true);
		super.onCreate(icicle);
		}

packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -226,7 +226,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
		mConnectivityManager = connectivityManager;

		// check if verbose logging developer option has been turned on or off
		sVerboseLogging = mWifiManager != null && (mWifiManager.getVerboseLoggingLevel() > 0);
		sVerboseLogging = mWifiManager != null && mWifiManager.isVerboseLoggingEnabled();

		mFilter = filter;

wifi/java/android/net/wifi/WifiManager.java

+20 −6

Original line number	Diff line number	Diff line
		@@ -4854,13 +4854,19 @@ public class WifiManager {
		/**
		* Set Wi-Fi verbose logging level from developer settings.
		*
		* @param verbose the verbose logging level to set. 0 will disable verbose logging, a positive
		* integer will enable verbose logging.
		* @param enable true to enable verbose logging, false to disable.
		*
		* @hide
		*/
		@SystemApi
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		public void setVerboseLoggingEnabled(boolean enable) {
		enableVerboseLogging(enable ? 1 : 0);
		}

		/** @hide */
		@UnsupportedAppUsage
		@RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)
		public void enableVerboseLogging (int verbose) {
		try {
		mService.enableVerboseLogging(verbose);
		@@ -4871,15 +4877,23 @@ public class WifiManager {
		}

		/**
		* Get the persisted WiFi verbose logging level, set by {@link #enableVerboseLogging(int)}.
		* Get the persisted Wi-Fi verbose logging level, set by
		* {@link #setVerboseLoggingEnabled(boolean)}.
		* No permissions are required to call this method.
		*
		* @return 0 to indicate that verbose logging is disabled, a positive integer to indicate that
		* verbose logging is enabled.
		* @return true to indicate that verbose logging is enabled, false to indicate that verbose
		* logging is disabled.
		*
		* @hide
		*/
		@SystemApi
		public boolean isVerboseLoggingEnabled() {
		return getVerboseLoggingLevel() > 0;
		}

		/** @hide */
		// TODO(b/145484145): remove once SUW stops calling this via reflection
		@UnsupportedAppUsage
		public int getVerboseLoggingLevel() {
		try {
		return mService.getVerboseLoggingLevel();
		@@ -5204,7 +5218,7 @@ public class WifiManager {
		* level from wifi service.
		*/
		private void updateVerboseLoggingEnabledFromService() {
		mVerboseLoggingEnabled = getVerboseLoggingLevel() > 0;
		mVerboseLoggingEnabled = isVerboseLoggingEnabled();
		}

		/**