Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27724516 authored by Fiona Campbell's avatar Fiona Campbell Committed by Android (Google) Code Review
Browse files

Merge "Fix crash in BrightnessTracker write events" into sc-dev

parents f0cf73d8 81f2bbe0

services/core/java/com/android/server/display/BrightnessTracker.java

+5 −1
Original line number Diff line number Diff line
@@ -567,7 +567,11 @@ public class BrightnessTracker { 
                out.attributeLong(null, ATTR_TIMESTAMP, toWrite[i].timeStamp);

                out.attribute(null, ATTR_PACKAGE_NAME, toWrite[i].packageName);

                out.attributeInt(null, ATTR_USER, userSerialNo);

                out.attribute(null, ATTR_UNIQUE_DISPLAY_ID, toWrite[i].uniqueDisplayId);

                String uniqueDisplayId = toWrite[i].uniqueDisplayId;

                if (uniqueDisplayId == null) {

                    uniqueDisplayId = "";

                }

                out.attribute(null, ATTR_UNIQUE_DISPLAY_ID, uniqueDisplayId);

                out.attributeFloat(null, ATTR_BATTERY_LEVEL, toWrite[i].batteryLevel);

                out.attributeBoolean(null, ATTR_NIGHT_MODE, toWrite[i].nightMode);

                out.attributeInt(null, ATTR_COLOR_TEMPERATURE,