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

am: 7da697a79f Change-Id: I644c302cc1cbea8b2387d9ac591845b7c43cc5c0
2016-07-20 22:10:44 +00:00
parent 46ceca1a1c 7da697a79f
commit 984d575d2e
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();
                    }
                }