Merge "BatteryStats: Don't print empty platform idle state" into nyc-mr1-dev

2016-07-20 21:56:01 +00:00
parent c50f8ae532 8568d8fd4f
commit ebbbead915
1 changed files with 3 additions and 1 deletions
--- a/core/java/android/os/BatteryStats.java
+++ b/core/java/android/os/BatteryStats.java
@@ -4966,7 +4966,9 @@ public abstract class BatteryStats implements Parcelable {
                        pw.print(',');
                        pw.print(rec.stepDetails.statIdlTime);
                        pw.print(',');
-                        pw.print(rec.stepDetails.statPlatformIdleState);
+                        if (rec.stepDetails.statPlatformIdleState != null) {
+                            pw.print(rec.stepDetails.statPlatformIdleState);
+                        }
                        pw.println();
                    }
                }