From 8ec5d327726e965821c961dfa63c75570b063d37 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Wed, 27 Jan 2021 14:40:58 +0900 Subject: [PATCH] Use consistent Wifi-only checking Use the same checkWifiOnly method in BatteryUsageStatsProvider and other battery stats logic. Bug: 174436414 Test: atest Change-Id: I6ae21c579a063c3dd65726620b7a6c9e9f09a957 --- .../internal/os/BatteryUsageStatsProvider.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java index b8c066db29afa..ea2fb88a3fc7b 100644 --- a/core/java/com/android/internal/os/BatteryUsageStatsProvider.java +++ b/core/java/com/android/internal/os/BatteryUsageStatsProvider.java @@ -18,7 +18,6 @@ package com.android.internal.os; import android.content.Context; import android.hardware.SensorManager; -import android.net.ConnectivityManager; import android.os.BatteryStats; import android.os.BatteryUsageStats; import android.os.BatteryUsageStatsQuery; @@ -57,7 +56,7 @@ public class BatteryUsageStatsProvider { mPowerCalculators.add(new CpuPowerCalculator(mPowerProfile)); mPowerCalculators.add(new MemoryPowerCalculator(mPowerProfile)); mPowerCalculators.add(new WakelockPowerCalculator(mPowerProfile)); - if (!isWifiOnlyDevice(mContext)) { + if (!BatteryStatsHelper.checkWifiOnly(mContext)) { mPowerCalculators.add(new MobileRadioPowerCalculator(mPowerProfile)); } mPowerCalculators.add(new WifiPowerCalculator(mPowerProfile)); @@ -81,14 +80,6 @@ public class BatteryUsageStatsProvider { 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. */