summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2017-04-06 00:11:10 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-04-06 00:11:10 +0000
commit6acf1cd8e4227ec9c58f8786fee4682cf46da845 (patch)
tree34526c86c792c9e7474f7c6a3edfbd040b169403 /service
parentb47b5e948b991a38df80bb711173e54a765ccb4a (diff)
parent87bbb7718a8d6a2d5cd419064825528ad2e861f6 (diff)
Merge "WifiServiceImpl: fix failing test" am: c258cac284
am: 87bbb7718a Change-Id: Ia2ae5b69af519fe1bcb68d34d28aa2094dcc24d9
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 03a88bc4e..f915a6d4f 100644
--- a/service/java/com/android/server/wifi/WifiServiceImpl.java
+++ b/service/java/com/android/server/wifi/WifiServiceImpl.java
@@ -1477,8 +1477,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);
}