summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2017-04-06 00:14:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-06 00:14:11 +0000
commitf48695bc11357bc31fe313efb033ef0902360625 (patch)
tree4a93b44f8ee642adcf3ec5446a6768fe746b8e01 /service
parent48fe3bb3b0458b66cba87a753cdba1ac0b8c4df3 (diff)
parent6acf1cd8e4227ec9c58f8786fee4682cf46da845 (diff)
Merge "WifiServiceImpl: fix failing test" am: c258cac284 am: 87bbb7718a
am: 6acf1cd8e4 Change-Id: I69ea4d3416af1508d97386fd63213858a5e1792d
Diffstat (limited to 'service')
-rw-r--r--service/java/com/android/server/wifi/WifiServiceImpl.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/service/java/com/android/server/wifi/WifiServiceImpl.java b/service/java/com/android/server/wifi/WifiServiceImpl.java
index a327fa7b1..c3e80705d 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1481,8 +1481,7 @@ public class WifiServiceImpl extends IWifiManager.Stub {
mWifiController.sendMessage(CMD_SCAN_ALWAYS_MODE_CHANGED);
}
};
-
- mContext.getContentResolver().registerContentObserver(
+ mFrameworkFacade.registerContentObserver(mContext,
Settings.Global.getUriFor(Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE),
false, contentObserver);
}