PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace the getBatteryLevel() method from SettingsLib API

Browse Source 
Bug: 260524172
Test: presubmit
Change-Id: Icb56abd3dc258dde142a956124dc12bbfd9ae889
This commit is contained in:
ykhung
2022-11-29 17:36:12 +08:00
parent 20f6b1faaa
commit e77b5bbecb
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/fuelgauge/BatteryUtils.java
View File

@@ -602,15 +602,6 @@ public class BatteryUtils {
/*receiver=*/ null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); /*receiver=*/ null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
} }
/** Gets the battery level from the intent. */
public static int getBatteryLevel(Intent intent) {
final int level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1);
final int scale = intent.getIntExtra(BatteryManager.EXTRA_SCALE, 0);
return scale == 0
? -1 /*invalid battery level*/
: Math.round((level / (float) scale) * 100f);
}
/** Gets the current dock defender mode */ /** Gets the current dock defender mode */
public static int getCurrentDockDefenderMode(Context context, BatteryInfo batteryInfo) { public static int getCurrentDockDefenderMode(Context context, BatteryInfo batteryInfo) {
if (batteryInfo.pluggedStatus == BatteryManager.BATTERY_PLUGGED_DOCK) { if (batteryInfo.pluggedStatus == BatteryManager.BATTERY_PLUGGED_DOCK) {

3
src/com/android/settings/fuelgauge/batteryusage/DatabaseUtils.java
View File

@@ -36,6 +36,7 @@ import androidx.annotation.VisibleForTesting;
import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase; import com.android.settings.fuelgauge.batteryusage.db.BatteryStateDatabase;
import com.android.settingslib.fuelgauge.BatteryStatus;
import java.time.Clock; import java.time.Clock;
import java.time.Duration; import java.time.Duration;
@@ -149,7 +150,7 @@ public final class DatabaseUtils {
clearMemory(); clearMemory();
return null; return null;
} }
final int batteryLevel = BatteryUtils.getBatteryLevel(intent); final int batteryLevel = BatteryStatus.getBatteryLevel(intent);
final int batteryStatus = intent.getIntExtra( final int batteryStatus = intent.getIntExtra(
BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN); BatteryManager.EXTRA_STATUS, BatteryManager.BATTERY_STATUS_UNKNOWN);
final int batteryHealth = intent.getIntExtra( final int batteryHealth = intent.getIntExtra(

1
tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageBroadcastReceiverTest.java
View File

@@ -132,6 +132,7 @@ public final class BatteryUsageBroadcastReceiverTest {
private static Intent getBatteryIntent(int level, int status) { private static Intent getBatteryIntent(int level, int status) {
final Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED); final Intent intent = new Intent(Intent.ACTION_BATTERY_CHANGED);
intent.putExtra(BatteryManager.EXTRA_LEVEL, level); intent.putExtra(BatteryManager.EXTRA_LEVEL, level);
intent.putExtra(BatteryManager.EXTRA_SCALE, 100);
intent.putExtra(BatteryManager.EXTRA_STATUS, status); intent.putExtra(BatteryManager.EXTRA_STATUS, status);
return intent; return intent;
} }