LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev

Browse Source
This commit is contained in:
Aaron Huang
2021-08-11 03:33:53 +00:00
committed by Android (Google) Code Review
parent 2900ffbb5f 58b493abf6
commit 9ac9c1d575
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/cts/net/src/android/net/cts/BatteryStatsManagerTest.java
View File

@@ -31,6 +31,7 @@ import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network; import android.net.Network;
import android.net.cts.util.CtsNetUtils; import android.net.cts.util.CtsNetUtils;
import android.net.wifi.WifiManager;
import android.os.BatteryStatsManager; import android.os.BatteryStatsManager;
import android.os.Build; import android.os.Build;
import android.os.connectivity.CellularBatteryStats; import android.os.connectivity.CellularBatteryStats;
@@ -70,6 +71,7 @@ public class BatteryStatsManagerTest{
private Context mContext; private Context mContext;
private BatteryStatsManager mBsm; private BatteryStatsManager mBsm;
private ConnectivityManager mCm; private ConnectivityManager mCm;
private WifiManager mWm;
private CtsNetUtils mCtsNetUtils; private CtsNetUtils mCtsNetUtils;
@Before @Before
@@ -77,6 +79,7 @@ public class BatteryStatsManagerTest{
mContext = getContext(); mContext = getContext();
mBsm = mContext.getSystemService(BatteryStatsManager.class); mBsm = mContext.getSystemService(BatteryStatsManager.class);
mCm = mContext.getSystemService(ConnectivityManager.class); mCm = mContext.getSystemService(ConnectivityManager.class);
mWm = mContext.getSystemService(WifiManager.class);
mCtsNetUtils = new CtsNetUtils(mContext); mCtsNetUtils = new CtsNetUtils(mContext);
} }
@@ -128,6 +131,11 @@ public class BatteryStatsManagerTest{
cellularStatsAfter -> cellularBatteryStatsIncreased( cellularStatsAfter -> cellularBatteryStatsIncreased(
cellularStatsBefore, cellularStatsAfter))); cellularStatsBefore, cellularStatsAfter)));
if (!mWm.isEnhancedPowerReportingSupported()) {
Log.d(TAG, "Skip wifi stats test because wifi does not support link layer stats.");
return;
}
WifiBatteryStats wifiStatsBefore = runAsShell(UPDATE_DEVICE_STATS, WifiBatteryStats wifiStatsBefore = runAsShell(UPDATE_DEVICE_STATS,
mBsm::getWifiBatteryStats); mBsm::getWifiBatteryStats);