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

am: ebbbead915 Change-Id: Ia651ad5a0a183ff7d70d90f119ec9238c15711ad
2016-07-20 22:05:38 +00:00
parent 2a7f27180d ebbbead915
commit 7da697a79f
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();
                    }
                }