From 91b446d59deb72283f11e62b79c04a31520eb9c9 Mon Sep 17 00:00:00 2001 From: nuclearmistake Date: Fri, 11 Dec 2015 14:23:41 -0500 Subject: AdbOverNetworkTile: only de/reregister the observer when setListening changes whether we should be listening Change-Id: Ie8d4109f0069dc64a1ab15299f497f0ff6217878 --- .../systemui/qs/tiles/AdbOverNetworkTile.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java index d741330..283d617 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java @@ -36,6 +36,8 @@ import org.cyanogenmod.internal.logging.CMMetricsLogger; public class AdbOverNetworkTile extends QSTile { + private boolean mListening; + private static final Intent SETTINGS_DEVELOPMENT = new Intent(Settings.ACTION_APPLICATION_DEVELOPMENT_SETTINGS); @@ -111,16 +113,18 @@ public class AdbOverNetworkTile extends QSTile { @Override public void setListening(boolean listening) { - if (listening) { - mContext.getContentResolver().registerContentObserver( - CMSettings.Secure.getUriFor(CMSettings.Secure.ADB_PORT), - false, mObserver); - mContext.getContentResolver().registerContentObserver( - Settings.Secure.getUriFor(Settings.Global.ADB_ENABLED), - false, mObserver); - } else { - mContext.getContentResolver().unregisterContentObserver(mObserver); + if (mListening != listening) { + mListening = listening; + if (listening) { + mContext.getContentResolver().registerContentObserver( + CMSettings.Secure.getUriFor(CMSettings.Secure.ADB_PORT), + false, mObserver); + mContext.getContentResolver().registerContentObserver( + Settings.Secure.getUriFor(Settings.Global.ADB_ENABLED), + false, mObserver); + } else { + mContext.getContentResolver().unregisterContentObserver(mObserver); + } } } - } -- cgit v1.1