Merge "Delete content observers."

1 files changed, 10 insertions, 39 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
index 228ef273d3b3..664dcfcb9608 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/WifiTracker.java
@@ -20,7 +20,6 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.database.ContentObserver;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -70,8 +69,7 @@ public class WifiTracker {
      * Default maximum age in millis of cached scored networks in
      * {@link AccessPoint#mScoredNetworkCache} to be used for speed label generation.
      */
-    private static final long MAX_CACHED_SCORE_AGE_MILLIS_DEFAULT =
-            20 * DateUtils.MINUTE_IN_MILLIS;
+    private static final long DEFAULT_MAX_CACHED_SCORE_AGE_MILLIS = 20 * DateUtils.MINUTE_IN_MILLIS;
 
     private static final String TAG = "WifiTracker";
     private static final boolean DBG() {
@@ -146,8 +144,6 @@ public class WifiTracker {
     private final NetworkScoreManager mNetworkScoreManager;
     private final WifiNetworkScoreCache mScoreCache;
     private boolean mNetworkScoringUiEnabled;
-    private final ContentObserver mScoringEnabledObserver;
-    private final ContentObserver mSpeedLabelCacheAgeObserver;
     private long mMaxSpeedLabelScoreCacheAge;
 
     @GuardedBy("mLock")
@@ -246,27 +242,6 @@ public class WifiTracker {
                 updateNetworkScores();
             }
         });
-
-        mScoringEnabledObserver = new ContentObserver(mWorkHandler) {
-            @Override
-            public void onChange(boolean selfChange) {
-                mNetworkScoringUiEnabled =
-                        Settings.Global.getInt(
-                                mContext.getContentResolver(),
-                                Settings.Global.NETWORK_SCORING_UI_ENABLED, 0) == 1;
-            }
-        };
-
-        mSpeedLabelCacheAgeObserver = new ContentObserver(mWorkHandler) {
-            @Override
-            public void onChange(boolean selfChange) {
-                mMaxSpeedLabelScoreCacheAge =
-                        Settings.Global.getLong(
-                                mContext.getContentResolver(),
-                                Settings.Global.SPEED_LABEL_CACHE_EVICTION_AGE_MILLIS,
-                                MAX_CACHED_SCORE_AGE_MILLIS_DEFAULT);
-            }
-        };
     }
 
     /** Synchronously update the list of access points with the latest information. */
@@ -342,18 +317,16 @@ public class WifiTracker {
         synchronized (mLock) {
             registerScoreCache();
 
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Global.getUriFor(Settings.Global.NETWORK_SCORING_UI_ENABLED),
-                    false /* notifyForDescendants */,
-                    mScoringEnabledObserver);
-            mScoringEnabledObserver.onChange(false /* selfChange */); // Set mScoringUiEnabled
+            mNetworkScoringUiEnabled =
+                    Settings.Global.getInt(
+                            mContext.getContentResolver(),
+                            Settings.Global.NETWORK_SCORING_UI_ENABLED, 0) == 1;
 
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Global.getUriFor(
-                            Settings.Global.SPEED_LABEL_CACHE_EVICTION_AGE_MILLIS),
-                    false /* notifyForDescendants */,
-                    mSpeedLabelCacheAgeObserver);
-            mSpeedLabelCacheAgeObserver.onChange(false /* selfChange */); // Set initial value
+            mMaxSpeedLabelScoreCacheAge =
+                    Settings.Global.getLong(
+                            mContext.getContentResolver(),
+                            Settings.Global.SPEED_LABEL_CACHE_EVICTION_AGE_MILLIS,
+                            DEFAULT_MAX_CACHED_SCORE_AGE_MILLIS);
 
             resumeScanning();
             if (!mRegistered) {
@@ -405,8 +378,6 @@ public class WifiTracker {
             }
             unregisterScoreCache();
             pauseScanning();
-            mContext.getContentResolver().unregisterContentObserver(mScoringEnabledObserver);
-            mContext.getContentResolver().unregisterContentObserver(mSpeedLabelCacheAgeObserver);
 
             mWorkHandler.removePendingMessages();
             mMainHandler.removePendingMessages();