PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move to non-static WifiTrackerLib isVerboseLoggingEnabled() methods" into main

Browse Source
This commit is contained in:
Quang Luong
2023-11-01 03:26:07 +00:00
committed by Android (Google) Code Review
parent bf18e7967e 2df8aa26a3
commit d30a19395e
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/NetworkProviderSettings.java
View File

@@ -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);
}

3
src/com/android/settings/wifi/WifiEntryPreference.java
View File

@@ -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);