Merge "Skip wifi stats test if link layer stats is not supported" into sc-dev
This commit is contained in:
@@ -31,6 +31,7 @@ import android.content.Context;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Network;
|
||||
import android.net.cts.util.CtsNetUtils;
|
||||
import android.net.wifi.WifiManager;
|
||||
import android.os.BatteryStatsManager;
|
||||
import android.os.Build;
|
||||
import android.os.connectivity.CellularBatteryStats;
|
||||
@@ -70,6 +71,7 @@ public class BatteryStatsManagerTest{
|
||||
private Context mContext;
|
||||
private BatteryStatsManager mBsm;
|
||||
private ConnectivityManager mCm;
|
||||
private WifiManager mWm;
|
||||
private CtsNetUtils mCtsNetUtils;
|
||||
|
||||
@Before
|
||||
@@ -77,6 +79,7 @@ public class BatteryStatsManagerTest{
|
||||
mContext = getContext();
|
||||
mBsm = mContext.getSystemService(BatteryStatsManager.class);
|
||||
mCm = mContext.getSystemService(ConnectivityManager.class);
|
||||
mWm = mContext.getSystemService(WifiManager.class);
|
||||
mCtsNetUtils = new CtsNetUtils(mContext);
|
||||
}
|
||||
|
||||
@@ -128,6 +131,11 @@ public class BatteryStatsManagerTest{
|
||||
cellularStatsAfter -> cellularBatteryStatsIncreased(
|
||||
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,
|
||||
mBsm::getWifiBatteryStats);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user