diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
index b022fcf7df2..c1c7635751c 100644
--- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryCycleCountPreferenceController.java
@@ -44,7 +44,7 @@ public class BatteryCycleCountPreferenceController extends BasePreferenceControl
         final Intent batteryIntent = BatteryUtils.getBatteryIntent(mContext);
         final int cycleCount = batteryIntent.getIntExtra(BatteryManager.EXTRA_CYCLE_COUNT, -1);
 
-        return cycleCount == -1
+        return cycleCount <= 0
                 ? mContext.getText(R.string.battery_cycle_count_not_available)
                 : Integer.toString(cycleCount);
     }
diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryDesignCapacityPreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryDesignCapacityPreferenceController.java
index f91433d3c02..ab40d30607c 100644
--- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryDesignCapacityPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryDesignCapacityPreferenceController.java
@@ -44,7 +44,7 @@ public class BatteryDesignCapacityPreferenceController extends BasePreferenceCon
         final int designCapacityUah =
                 batteryIntent.getIntExtra(BatteryManager.EXTRA_DESIGN_CAPACITY, -1);
 
-        if (designCapacityUah != -1) {
+        if (designCapacityUah > 0) {
             int designCapacity = designCapacityUah / 1_000;
             return mContext.getString(R.string.battery_design_capacity_summary, designCapacity);
         }
diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryMaximumCapacityPreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryMaximumCapacityPreferenceController.java
index 034e42fb059..186945efde8 100644
--- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryMaximumCapacityPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryMaximumCapacityPreferenceController.java
@@ -46,7 +46,7 @@ public class BatteryMaximumCapacityPreferenceController extends BasePreferenceCo
         final int designCapacityUah =
                 batteryIntent.getIntExtra(BatteryManager.EXTRA_DESIGN_CAPACITY, -1);
 
-        if (maxCapacityUah != -1 && designCapacityUah != -1) {
+        if (maxCapacityUah > 0 && designCapacityUah > 0) {
             int maxCapacity = maxCapacityUah / 1_000;
             int designCapacity = designCapacityUah / 1_000;
             int percentage = (maxCapacity * 100) / designCapacity;
diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryTemperaturePreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryTemperaturePreferenceController.java
index 07506f709a6..8049f325114 100644
--- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryTemperaturePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryTemperaturePreferenceController.java
@@ -49,7 +49,7 @@ public class BatteryTemperaturePreferenceController extends BasePreferenceContro
         final int temperatureTenths =
                 batteryIntent.getIntExtra(BatteryManager.EXTRA_TEMPERATURE, -1);
 
-        if (temperatureTenths != -1) {
+        if (temperatureTenths > 0) {
             float temperature = temperatureTenths / 10f;
 
             return MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.SHORT)
diff --git a/src/com/android/settings/deviceinfo/batteryinfo/BatteryVoltagePreferenceController.java b/src/com/android/settings/deviceinfo/batteryinfo/BatteryVoltagePreferenceController.java
index 2ceae42f692..0fc408f4ec2 100644
--- a/src/com/android/settings/deviceinfo/batteryinfo/BatteryVoltagePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/batteryinfo/BatteryVoltagePreferenceController.java
@@ -48,7 +48,7 @@ public class BatteryVoltagePreferenceController extends BasePreferenceController
         final Intent batteryIntent = BatteryUtils.getBatteryIntent(mContext);
         final int voltageMillivolts = batteryIntent.getIntExtra(BatteryManager.EXTRA_VOLTAGE, -1);
 
-        if (voltageMillivolts != -1) {
+        if (voltageMillivolts > 0) {
             float voltage = voltageMillivolts / 1_000f;
 
             return MeasureFormat.getInstance(Locale.getDefault(), MeasureFormat.FormatWidth.SHORT)
diff --git a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
index eab3cdc3910..0e14448b293 100644
--- a/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceController.java
@@ -161,7 +161,7 @@ public class BatteryHeaderPreferenceController extends BasePreferenceController
         mBatteryUsageProgressBarPref.setUsageSummary(formatBatteryPercentageText(batteryLevel));
         mBatteryUsageProgressBarPref.setPercent(batteryLevel, BATTERY_MAX_LEVEL);
 
-        if (chargeCounterUah != -1) {
+        if (chargeCounterUah > 0) {
             int chargeCounter = chargeCounterUah / 1_000;
             mBatteryUsageProgressBarPref.setTotalSummary(
                     formatBatteryChargeCounterText(chargeCounter));