From f2f61212b1025e2e19148d5d5f08fdce64b16799 Mon Sep 17 00:00:00 2001 From: David Su Date: Wed, 10 Oct 2018 16:49:03 -0700 Subject: Moved WifiWakeReasonAndCounts into opt/net/wifi Moved WifiWakeReasonAndCounts from base/wifi into opt/net/wifi and renamed it to WlanWakeReasonAndCounts. This class is only used internally and not exposed in the public API, so it did not make sense to leave it in base/wifi. Renamed it to WlanWakeReasonAndCounts to reduce confusion between this class and the "Wifi Wake" feature. Bug: 73503971 Change-Id: Ie1a1c9f742a5104e5fba943d8ea8186438349b37 Fix: 73503971 Test: frameworks/opt/net/wifi/tests/wifitests/runtests.sh --- tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java index 9ca722164..65ff7d2c9 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiVendorHalTest.java @@ -84,7 +84,6 @@ import android.net.wifi.ScanResult; import android.net.wifi.WifiManager; import android.net.wifi.WifiScanner; import android.net.wifi.WifiSsid; -import android.net.wifi.WifiWakeReasonAndCounts; import android.os.Looper; import android.os.RemoteException; import android.os.test.TestLooper; @@ -1893,7 +1892,7 @@ public class WifiVendorHalTest { assertTrue(mWifiVendorHal.startVendorHalSta()); - WifiWakeReasonAndCounts retrievedStats = mWifiVendorHal.getWlanWakeReasonCount(); + WlanWakeReasonAndCounts retrievedStats = mWifiVendorHal.getWlanWakeReasonCount(); verify(mIWifiChip).getDebugHostWakeReasonStats( any(IWifiChip.getDebugHostWakeReasonStatsCallback.class)); assertNotNull(retrievedStats); -- cgit v1.2.3