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

Commit 780e7d27 authored by Piotr Wilczyński's avatar Piotr Wilczyński Committed by Automerger Merge Worker
Browse files

Merge "Fix NPE when store brightness and displayDevice is null" am: 9741dde4... 

Merge "Fix NPE when store brightness and displayDevice is null" am: 9741dde4 am: b84ea8d1 am: b510eaf9 am: c2116165 am: 9e045abc

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



Change-Id: I8f80402c941484bbe431263160da0b9d3bf78582
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3b56ed2f 9e045abc

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

+4 −1
Original line number Diff line number Diff line
@@ -306,8 +306,11 @@ final class PersistentDataStore { 
    }



    public boolean setBrightness(DisplayDevice displayDevice, float brightness) {

        if (displayDevice == null || !displayDevice.hasStableUniqueId()) {

            return false;

        }

        final String displayDeviceUniqueId = displayDevice.getUniqueId();

        if (!displayDevice.hasStableUniqueId() || displayDeviceUniqueId == null) {

        if (displayDeviceUniqueId == null) {

            return false;

        }

        final DisplayState state = getDisplayState(displayDeviceUniqueId, true);