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

Commit b510eaf9 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 am: b84ea8d1 

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



Change-Id: Ic33eb83d16e4a2d2c70af457be2476546345a232
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb5fd995 b84ea8d1

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);