Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev (8695bda3) · Commits · e / os / android_frameworks_base

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

+4 −22

Original line number	Diff line number	Diff line
		@@ -136,8 +136,6 @@ public class WifiTracker {

		private final NetworkScoreManager mNetworkScoreManager;
		private final WifiNetworkScoreCache mScoreCache;
		private boolean mNetworkScoringUiEnabled;
		private final ContentObserver mObserver;

		@GuardedBy("mLock")
		private final Set<NetworkKey> mRequestedScores = new ArraySet<>();
		@@ -225,16 +223,6 @@ public class WifiTracker {
		updateNetworkScores();
		}
		});

		mObserver = new ContentObserver(mWorkHandler) {
		@Override
		public void onChange(boolean selfChange) {
		mNetworkScoringUiEnabled =
		Settings.Global.getInt(
		mContext.getContentResolver(),
		Settings.Global.NETWORK_SCORING_UI_ENABLED, 0) == 1;
		}
		};
		}

		/**
		@@ -308,12 +296,6 @@ public class WifiTracker {
		synchronized (mLock) {
		registerScoreCache();

		mContext.getContentResolver().registerContentObserver(
		Settings.Global.getUriFor(Settings.Global.NETWORK_SCORING_UI_ENABLED),
		false /* notifyForDescendants */,
		mObserver);
		mObserver.onChange(false /* selfChange */); // Set mScoringUiEnabled

		resumeScanning();
		if (!mRegistered) {
		mContext.registerReceiver(mReceiver, mFilter);
		@@ -360,7 +342,6 @@ public class WifiTracker {
		}
		unregisterAndClearScoreCache();
		pauseScanning();
		mContext.getContentResolver().unregisterContentObserver(mObserver);

		mWorkHandler.removePendingMessages();
		mMainHandler.removePendingMessages();
		@@ -580,7 +561,7 @@ public class WifiTracker {

		requestScoresForNetworkKeys(scoresToRequest);
		for (AccessPoint ap : accessPoints) {
		ap.update(mScoreCache, mNetworkScoringUiEnabled);
		ap.update(mScoreCache, false /* mNetworkScoringUiEnabled */);
		}

		// Pre-sort accessPoints to speed preference insertion
		@@ -678,7 +659,7 @@ public class WifiTracker {
		updated = true;
		if (previouslyConnected != ap.isActive()) reorder = true;
		}
		if (ap.update(mScoreCache, mNetworkScoringUiEnabled)) {
		if (ap.update(mScoreCache, false /* mNetworkScoringUiEnabled */)) {
		reorder = true;
		updated = true;
		}
		@@ -701,7 +682,8 @@ public class WifiTracker {
		synchronized (mLock) {
		boolean updated = false;
		for (int i = 0; i < mInternalAccessPoints.size(); i++) {
		if (mInternalAccessPoints.get(i).update(mScoreCache, mNetworkScoringUiEnabled)) {
		if (mInternalAccessPoints.get(i).update(
		mScoreCache, false /* mNetworkScoringUiEnabled */)) {
		updated = true;
		}
		}

packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -473,7 +473,7 @@ public class WifiTrackerTest {
		}

		@Test
		public void scoreCacheUpdateScoresShouldChangeSortOrder() throws InterruptedException {
		public void scoreCacheUpdateScoresShouldNotChangeSortOrder() throws InterruptedException {
		WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults();
		List<AccessPoint> aps = tracker.getAccessPoints();
		assertTrue(aps.size() == 2);
		@@ -484,8 +484,8 @@ public class WifiTrackerTest {

		aps = tracker.getAccessPoints();
		assertTrue(aps.size() == 2);
		assertEquals(aps.get(0).getSsidStr(), SSID_2);
		assertEquals(aps.get(1).getSsidStr(), SSID_1);
		assertEquals(aps.get(0).getSsidStr(), SSID_1);
		assertEquals(aps.get(1).getSsidStr(), SSID_2);
		}

		@Test
		@@ -511,7 +511,8 @@ public class WifiTrackerTest {
		}

		@Test
		public void scoreCacheUpdateScoresShouldInsertBadgeIntoAccessPoint() throws InterruptedException {
		public void scoreCacheUpdateScoresShouldNotInsertBadgeIntoAccessPoint()
		throws InterruptedException {
		WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults();
		updateScoresAndWaitForAccessPointsChangedCallback();

		@@ -519,9 +520,9 @@ public class WifiTrackerTest {

		for (AccessPoint ap : aps) {
		if (ap.getSsidStr().equals(SSID_1)) {
		assertEquals(BADGE_1, ap.getBadge());
		assertEquals(NetworkBadging.BADGING_NONE, ap.getBadge());
		} else if (ap.getSsidStr().equals(SSID_2)) {
		assertEquals(BADGE_2, ap.getBadge());
		assertEquals(NetworkBadging.BADGING_NONE, ap.getBadge());
		}
		}
		}