Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE when store brightness and displayDevice is null" am: 9741dde491 am: b84ea8d1ec

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

Change-Id: Ic33eb83d16e4a2d2c70af457be2476546345a232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Piotr Wilczyński
2023-04-13 15:42:49 +00:00
committed by Automerger Merge Worker
parent bb5fd99527 b84ea8d1ec
commit b510eaf989
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/display/PersistentDataStore.java
View File

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