Merge "Move to non-static WifiTrackerLib isVerboseLoggingEnabled() methods" into main (d30a1939) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/network/NetworkProviderSettings.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -175,10 +175,6 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		private static final String EXTRA_START_CONNECT_SSID = "wifi_start_connect_ssid";
		private String mOpenSsid;

		private static boolean isVerboseLoggingEnabled() {
		return WifiPickerTracker.isVerboseLoggingEnabled();
		}

		private boolean mIsViewLoading;
		@VisibleForTesting
		final Runnable mRemoveLoadingRunnable = () -> {
		@@ -840,7 +836,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
		}
		final int wifiState = mWifiPickerTracker.getWifiState();

		if (isVerboseLoggingEnabled()) {
		if (mWifiPickerTracker.isVerboseLoggingEnabled()) {
		Log.i(TAG, "onWifiStateChanged called with wifi state: " + wifiState);
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ import com.android.settingslib.R;
		import com.android.settingslib.RestrictedPreference;
		import com.android.settingslib.Utils;
		import com.android.settingslib.wifi.WifiUtils;
		import com.android.wifitrackerlib.BaseWifiTracker;
		import com.android.wifitrackerlib.HotspotNetworkEntry;
		import com.android.wifitrackerlib.WifiEntry;

		@@ -108,7 +107,7 @@ public class WifiEntryPreference extends RestrictedPreference implements
		@Override
		public void onBindViewHolder(final PreferenceViewHolder view) {
		super.onBindViewHolder(view);
		if (BaseWifiTracker.isVerboseLoggingEnabled()) {
		if (mWifiEntry.isVerboseSummaryEnabled()) {
		TextView summary = (TextView) view.findViewById(android.R.id.summary);
		if (summary != null) {
		summary.setMaxLines(100);