Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use consistent Wifi-only checking" into sc-dev

Browse Source
This commit is contained in:
Remi NGUYEN VAN
2021-02-02 01:26:16 +00:00
committed by Android (Google) Code Review
parent 31741788ab 8ec5d32772
commit 9d060c9e6e
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/com/android/internal/os/BatteryUsageStatsProvider.java
View File

@@ -18,7 +18,6 @@ package com.android.internal.os;
import android.content.Context; import android.content.Context;
import android.hardware.SensorManager; import android.hardware.SensorManager;
import android.net.ConnectivityManager;
import android.os.BatteryStats; import android.os.BatteryStats;
import android.os.BatteryUsageStats; import android.os.BatteryUsageStats;
import android.os.BatteryUsageStatsQuery; import android.os.BatteryUsageStatsQuery;
@@ -57,7 +56,7 @@ public class BatteryUsageStatsProvider {
mPowerCalculators.add(new CpuPowerCalculator(mPowerProfile)); mPowerCalculators.add(new CpuPowerCalculator(mPowerProfile));
mPowerCalculators.add(new MemoryPowerCalculator(mPowerProfile)); mPowerCalculators.add(new MemoryPowerCalculator(mPowerProfile));
mPowerCalculators.add(new WakelockPowerCalculator(mPowerProfile)); mPowerCalculators.add(new WakelockPowerCalculator(mPowerProfile));
if (!isWifiOnlyDevice(mContext)) { if (!BatteryStatsHelper.checkWifiOnly(mContext)) {
mPowerCalculators.add(new MobileRadioPowerCalculator(mPowerProfile)); mPowerCalculators.add(new MobileRadioPowerCalculator(mPowerProfile));
} }
mPowerCalculators.add(new WifiPowerCalculator(mPowerProfile)); mPowerCalculators.add(new WifiPowerCalculator(mPowerProfile));
@@ -81,14 +80,6 @@ public class BatteryUsageStatsProvider {
return mPowerCalculators; return mPowerCalculators;
} }
private static boolean isWifiOnlyDevice(Context context) {
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
if (cm == null) {
return false;
}
return !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
}
/** /**
* Returns a snapshot of battery attribution data. * Returns a snapshot of battery attribution data.
*/ */