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

Commit 6422c067 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash in BrightnessTracker" into sc-dev am: 438fa8a3 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13929667

Change-Id: I6cdf9049a8babe3751791c86cc65d3aee4dba7ef
parents b7a38254 438fa8a3

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

+5 −2
Original line number Diff line number Diff line
@@ -652,8 +652,11 @@ public class BrightnessTracker { 
                    builder.setPackageName(parser.getAttributeValue(null, ATTR_PACKAGE_NAME));

                    builder.setUserId(mInjector.getUserId(mUserManager,

                            parser.getAttributeInt(null, ATTR_USER)));

                    builder.setUniqueDisplayId(

                            parser.getAttributeValue(null, ATTR_UNIQUE_DISPLAY_ID));

                    String uniqueDisplayId = parser.getAttributeValue(null, ATTR_UNIQUE_DISPLAY_ID);

                    if (uniqueDisplayId == null) {

                        uniqueDisplayId = "";

                    }

                    builder.setUniqueDisplayId(uniqueDisplayId);

                    builder.setBatteryLevel(parser.getAttributeFloat(null, ATTR_BATTERY_LEVEL));

                    builder.setNightMode(parser.getAttributeBoolean(null, ATTR_NIGHT_MODE));

                    builder.setColorTemperature(