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-11 18:13:03 +0000
commit6232408a5fc660b2d8642d56747e05c15c6255b8 (patch)
tree431c8104189c93e105f87b464e5ff476fe8d6ebd /service
parent36f52ffb5fd16c89f022dead27d8df9e51874160 (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 Merged-In: 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 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);
}