Merge "Changed AccessPointPreference setTitle to use getTitle()" (391c30c1) · Commits · e / os / android_frameworks_base

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

+7 −0

Original line number	Diff line number	Diff line
		@@ -833,6 +833,11 @@ public class AccessPoint implements Comparable<AccessPoint> {
		return ssid;
		}

		/**
		* Returns the name associated with the stored config.
		* @deprecated Please use {@link #getTitle()} instead to get the display name of an AccessPoint.
		*/
		@Deprecated
		public String getConfigName() {
		if (mConfig != null && mConfig.isPasspoint()) {
		return mConfig.providerFriendlyName;
		@@ -895,6 +900,8 @@ public class AccessPoint implements Comparable<AccessPoint> {
		public String getTitle() {
		if (isPasspoint()) {
		return mConfig.providerFriendlyName;
		} else if (isPasspointConfig()) {
		return mProviderFriendlyName;
		} else if (isOsuProvider()) {
		return mOsuProvider.getFriendlyName();
		} else {

+3 −7

Original line number	Diff line number	Diff line
		@@ -232,7 +232,7 @@ public class AccessPointPreference extends Preference {
		* Updates the title and summary; may indirectly call notifyChanged().
		*/
		public void refresh() {
		setTitle(this, mAccessPoint, mForSavedNetworks);
		setTitle(this, mAccessPoint);
		final Context context = getContext();
		int level = mAccessPoint.getLevel();
		int wifiSpeed = mAccessPoint.getSpeed();
		@@ -262,13 +262,9 @@ public class AccessPointPreference extends Preference {
		}

		@VisibleForTesting
		static void setTitle(AccessPointPreference preference, AccessPoint ap, boolean savedNetworks) {
		if (savedNetworks) {
		preference.setTitle(ap.getConfigName());
		} else {
		static void setTitle(AccessPointPreference preference, AccessPoint ap) {
		preference.setTitle(ap.getTitle());
		}
		}

		/**
		* Helper method to generate content description string.

+8 −8

Original line number	Diff line number	Diff line
		@@ -608,23 +608,23 @@ public class WifiTracker implements LifecycleObserver, OnStart, OnStop, OnDestro

		// Log accesspoints that are being removed
		if (DBG()) {
		Log.d(TAG, "------ Dumping SSIDs that were not seen on this scan ------");
		Log.d(TAG,
		"------ Dumping AccessPoints that were not seen on this scan ------");
		for (AccessPoint prevAccessPoint : mInternalAccessPoints) {
		if (prevAccessPoint.getSsid() == null)
		continue;
		String prevSsid = prevAccessPoint.getSsidStr();
		String prevTitle = prevAccessPoint.getTitle();
		boolean found = false;
		for (AccessPoint newAccessPoint : accessPoints) {
		if (newAccessPoint.getSsidStr() != null && newAccessPoint.getSsidStr()
		.equals(prevSsid)) {
		if (newAccessPoint.getTitle() != null && newAccessPoint.getTitle()
		.equals(prevTitle)) {
		found = true;
		break;
		}
		}
		if (!found)
		Log.d(TAG, "Did not find " + prevSsid + " in this scan");
		Log.d(TAG, "Did not find " + prevTitle + " in this scan");
		}
		Log.d(TAG, "---- Done dumping SSIDs that were not seen on this scan ----");
		Log.d(TAG,
		"---- Done dumping AccessPoints that were not seen on this scan ----");
		}

		mInternalAccessPoints.clear();

+1 −1

Original line number	Diff line number	Diff line
		@@ -713,7 +713,7 @@ public class AccessPointTest {
		.setProviderFriendlyName(providerFriendlyName).build();
		assertThat(ap.isPasspointConfig()).isTrue();
		assertThat(ap.getPasspointFqdn()).isEqualTo(fqdn);
		assertThat(ap.getConfigName()).isEqualTo(providerFriendlyName);
		assertThat(ap.getTitle()).isEqualTo(providerFriendlyName);
		}

		@Test

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ public class AccessPointPreferenceTest {
		.build();
		final AccessPointPreference preference = mock(AccessPointPreference.class);

		AccessPointPreference.setTitle(preference, ap, false /* savedNetwork */);
		AccessPointPreference.setTitle(preference, ap);
		verify(preference).setTitle(ssid);
		}
		}