Merge "Remove uses of deprecated class, BatteryStatsHelper"
This commit is contained in:
committed by
Android (Google) Code Review
commit
15a0b54d60
@@ -18,13 +18,11 @@ package com.android.settings.fuelgauge;
|
|||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.IntentFilter;
|
import android.content.IntentFilter;
|
||||||
import android.os.BatteryStats;
|
|
||||||
import android.os.BatteryStatsManager;
|
import android.os.BatteryStatsManager;
|
||||||
import android.os.BatteryUsageStats;
|
import android.os.BatteryUsageStats;
|
||||||
import android.os.SystemClock;
|
import android.os.SystemClock;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.android.internal.os.BatteryStatsHelper;
|
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settingslib.fuelgauge.Estimate;
|
import com.android.settingslib.fuelgauge.Estimate;
|
||||||
import com.android.settingslib.fuelgauge.EstimateKt;
|
import com.android.settingslib.fuelgauge.EstimateKt;
|
||||||
@@ -37,11 +35,8 @@ import java.util.List;
|
|||||||
public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
|
public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
|
||||||
private static final String TAG = "DebugEstimatesLoader";
|
private static final String TAG = "DebugEstimatesLoader";
|
||||||
|
|
||||||
private BatteryStatsHelper mStatsHelper;
|
public DebugEstimatesLoader(Context context) {
|
||||||
|
|
||||||
public DebugEstimatesLoader(Context context, BatteryStatsHelper statsHelper) {
|
|
||||||
super(context);
|
super(context);
|
||||||
mStatsHelper = statsHelper;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -60,7 +55,6 @@ public class DebugEstimatesLoader extends AsyncLoaderCompat<List<BatteryInfo>> {
|
|||||||
SystemClock.elapsedRealtime());
|
SystemClock.elapsedRealtime());
|
||||||
Intent batteryBroadcast = getContext().registerReceiver(null,
|
Intent batteryBroadcast = getContext().registerReceiver(null,
|
||||||
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
|
new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
|
||||||
BatteryStats stats = mStatsHelper.getStats();
|
|
||||||
BatteryUsageStats batteryUsageStats;
|
BatteryUsageStats batteryUsageStats;
|
||||||
try {
|
try {
|
||||||
batteryUsageStats = context.getSystemService(BatteryStatsManager.class)
|
batteryUsageStats = context.getSystemService(BatteryStatsManager.class)
|
||||||
|
Reference in New Issue
Block a user