Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DO NOT MERGE: Kill Wifi Badging in OC." into oc-dev

Browse Source 
am: 584406f8e1

Change-Id: I42fad81d99eb8ed540ef24fae1b4e86402b33a82
This commit is contained in:
Sundeep Ghuman
2017-06-07 23:25:57 +00:00
committed by android-build-merger
parent 6acd6102c9 584406f8e1
commit 8695bda38e
2 changed files with 11 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
View File

@@ -136,8 +136,6 @@ public class WifiTracker {
private final NetworkScoreManager mNetworkScoreManager; private final NetworkScoreManager mNetworkScoreManager;
private final WifiNetworkScoreCache mScoreCache; private final WifiNetworkScoreCache mScoreCache;
private boolean mNetworkScoringUiEnabled;
private final ContentObserver mObserver;
@GuardedBy("mLock") @GuardedBy("mLock")
private final Set<NetworkKey> mRequestedScores = new ArraySet<>(); private final Set<NetworkKey> mRequestedScores = new ArraySet<>();
@@ -225,16 +223,6 @@ public class WifiTracker {
updateNetworkScores(); 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) { synchronized (mLock) {
registerScoreCache(); registerScoreCache();
mContext.getContentResolver().registerContentObserver(
Settings.Global.getUriFor(Settings.Global.NETWORK_SCORING_UI_ENABLED),
false /* notifyForDescendants */,
mObserver);
mObserver.onChange(false /* selfChange */); // Set mScoringUiEnabled
resumeScanning(); resumeScanning();
if (!mRegistered) { if (!mRegistered) {
mContext.registerReceiver(mReceiver, mFilter); mContext.registerReceiver(mReceiver, mFilter);
@@ -360,7 +342,6 @@ public class WifiTracker {
} }
unregisterAndClearScoreCache(); unregisterAndClearScoreCache();
pauseScanning(); pauseScanning();
mContext.getContentResolver().unregisterContentObserver(mObserver);
mWorkHandler.removePendingMessages(); mWorkHandler.removePendingMessages();
mMainHandler.removePendingMessages(); mMainHandler.removePendingMessages();
@@ -580,7 +561,7 @@ public class WifiTracker {
requestScoresForNetworkKeys(scoresToRequest); requestScoresForNetworkKeys(scoresToRequest);
for (AccessPoint ap : accessPoints) { for (AccessPoint ap : accessPoints) {
ap.update(mScoreCache, mNetworkScoringUiEnabled); ap.update(mScoreCache, false /* mNetworkScoringUiEnabled */);
} }
// Pre-sort accessPoints to speed preference insertion // Pre-sort accessPoints to speed preference insertion
@@ -678,7 +659,7 @@ public class WifiTracker {
updated = true; updated = true;
if (previouslyConnected != ap.isActive()) reorder = true; if (previouslyConnected != ap.isActive()) reorder = true;
} }
if (ap.update(mScoreCache, mNetworkScoringUiEnabled)) { if (ap.update(mScoreCache, false /* mNetworkScoringUiEnabled */)) {
reorder = true; reorder = true;
updated = true; updated = true;
} }
@@ -701,7 +682,8 @@ public class WifiTracker {
synchronized (mLock) { synchronized (mLock) {
boolean updated = false; boolean updated = false;
for (int i = 0; i < mInternalAccessPoints.size(); i++) { 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; updated = true;
} }
} }

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

@@ -473,7 +473,7 @@ public class WifiTrackerTest {
} }
@Test @Test
public void scoreCacheUpdateScoresShouldChangeSortOrder() throws InterruptedException { public void scoreCacheUpdateScoresShouldNotChangeSortOrder() throws InterruptedException {
WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(); WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults();
List<AccessPoint> aps = tracker.getAccessPoints(); List<AccessPoint> aps = tracker.getAccessPoints();
assertTrue(aps.size() == 2); assertTrue(aps.size() == 2);
@@ -484,8 +484,8 @@ public class WifiTrackerTest {
aps = tracker.getAccessPoints(); aps = tracker.getAccessPoints();
assertTrue(aps.size() == 2); assertTrue(aps.size() == 2);
assertEquals(aps.get(0).getSsidStr(), SSID_2); assertEquals(aps.get(0).getSsidStr(), SSID_1);
assertEquals(aps.get(1).getSsidStr(), SSID_1); assertEquals(aps.get(1).getSsidStr(), SSID_2);
} }
@Test @Test
@@ -511,7 +511,8 @@ public class WifiTrackerTest {
} }
@Test @Test
public void scoreCacheUpdateScoresShouldInsertBadgeIntoAccessPoint() throws InterruptedException { public void scoreCacheUpdateScoresShouldNotInsertBadgeIntoAccessPoint()
throws InterruptedException {
WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults(); WifiTracker tracker = createTrackerWithImmediateBroadcastsAndInjectInitialScanResults();
updateScoresAndWaitForAccessPointsChangedCallback(); updateScoresAndWaitForAccessPointsChangedCallback();
@@ -519,9 +520,9 @@ public class WifiTrackerTest {
for (AccessPoint ap : aps) { for (AccessPoint ap : aps) {
if (ap.getSsidStr().equals(SSID_1)) { if (ap.getSsidStr().equals(SSID_1)) {
assertEquals(BADGE_1, ap.getBadge()); assertEquals(NetworkBadging.BADGING_NONE, ap.getBadge());
} else if (ap.getSsidStr().equals(SSID_2)) { } else if (ap.getSsidStr().equals(SSID_2)) {
assertEquals(BADGE_2, ap.getBadge()); assertEquals(NetworkBadging.BADGING_NONE, ap.getBadge());
} }
} }
} }