From 889e961477cc1057439ceec7468120af6b21099e Mon Sep 17 00:00:00 2001 From: Sundeep Ghuman Date: Tue, 6 Jun 2017 12:27:25 -0700 Subject: [PATCH] DO NOT MERGE: Kill Wifi Badging in OC. Speed labeling is turned on in O-DR hence this CL should not be merged into master. Using the merged in tag below which implements speed labeling (ag/2346102) to prevent this CL from being merged into upstream branches which need scoring ui. Merged-In: I0fd96da6a06dafd8c8ebb435a2725ab155bd26ed Bug: b/35628911 Test: runtest --path frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java Change-Id: I5740f68be25d5ec297f1f7dc3b3e59203cec2eb5 --- .../android/settingslib/wifi/WifiTracker.java | 26 +++---------------- .../settingslib/wifi/WifiTrackerTest.java | 13 +++++----- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java index 20cc5a6233588..40a59cf1ab824 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java @@ -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 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; } } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java index 086e10cda4992..c52643243063b 100644 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java +++ b/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java @@ -473,7 +473,7 @@ public class WifiTrackerTest { } @Test - public void scoreCacheUpdateScoresShouldChangeSortOrder() throws InterruptedException { + public void scoreCacheUpdateScoresShouldNotChangeSortOrder() throws InterruptedException { WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(); List 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()); } } }