summaryrefslogtreecommitdiff
path: root/service
diff options
context:
space:
mode:
authorRebecca Silberstein <silberst@google.com>2017-04-05 10:01:12 -0700
committerRebecca Silberstein <silberst@google.com>2017-04-05 14:27:45 -0700
commitadd9d4668ae3ec9116823bd518f3c12f75a42970 (patch)
treec20dc736223606e8f62a8a71f08fd163ab28fd71 /service
parent9b5f1c811bbd6bffcf4367948cf87ecc9faac3bd (diff)
WifiServiceImpl: fix failing test
Fix failing unit test due to a change in the implementation of registerContentObserver. This method is final so our mock was not being called. The implementation change uses a static method, ultimately the source of the failure. Bug: 36919372 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh Change-Id: I15d680fdf1211c1171708a3305bdcdcf4b916961
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);
}