Merge "[Wi-Fi] WiFi SettingsLib inclusive language fix plan phase 3" (24beb16e) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -90,7 +90,7 @@ public class AccessPointPreference extends Preference {
		return frictionSld != null ? (StateListDrawable) frictionSld.getDrawable(0) : null;
		}

		// Used for dummy pref.
		// Used for fake pref.
		public AccessPointPreference(Context context, AttributeSet attrs) {
		super(context, attrs);
		mFrictionSld = null;
		@@ -142,7 +142,7 @@ public class AccessPointPreference extends Preference {
		public void onBindViewHolder(final PreferenceViewHolder view) {
		super.onBindViewHolder(view);
		if (mAccessPoint == null) {
		// Used for dummy pref.
		// Used for fake pref.
		return;
		}
		Drawable drawable = getIcon();

+1 −1

Original line number	Diff line number	Diff line
		@@ -256,7 +256,7 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro
		}

		/**
		* Sanity warning: this wipes out mScoreCache, so use with extreme caution
		* Validity warning: this wipes out mScoreCache, so use with extreme caution
		* @param workThread substitute Handler thread, for testing purposes only
		*/
		@VisibleForTesting

+3 −3

Original line number	Diff line number	Diff line
		@@ -118,7 +118,7 @@ public class WifiUtils {
		final int maxDisplayedScans = 4;
		int num5 = 0; // number of scanned BSSID on 5GHz band
		int num24 = 0; // number of scanned BSSID on 2.4Ghz band
		int numBlackListed = 0;
		int numBlockListed = 0;

		// TODO: sort list by RSSI or age
		long nowMs = SystemClock.elapsedRealtime();
		@@ -170,8 +170,8 @@ public class WifiUtils {
		}
		visibility.append(scans5GHz.toString());
		}
		if (numBlackListed > 0) {
		visibility.append("!").append(numBlackListed);
		if (numBlockListed > 0) {
		visibility.append("!").append(numBlockListed);
		}
		visibility.append("]");