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

Merge "Ensure configuration is not null." into tm-qpr-dev

Browse Source
This commit is contained in:
Silvia Vinyes
2022-11-16 14:03:30 +00:00
committed by Android (Google) Code Review
parent 5e77f8ce05 57ed805d4f
commit 31d3853edd
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1882,8 +1882,9 @@ public final class DisplayManagerService extends SystemService {
if (displayDevice == null) {
return;
}
if (mLogicalDisplayMapper.getDisplayLocked(displayDevice)
.getDisplayInfoLocked().type == Display.TYPE_INTERNAL) {
if (mLogicalDisplayMapper.getDisplayLocked(displayDevice) != null
&& mLogicalDisplayMapper.getDisplayLocked(displayDevice)
.getDisplayInfoLocked().type == Display.TYPE_INTERNAL && c != null) {
FrameworkStatsLog.write(FrameworkStatsLog.BRIGHTNESS_CONFIGURATION_UPDATED,
c.getCurve().first,
c.getCurve().second,