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

Commit b63b9a0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Avoid NullPointerException when deviceProductInfo is null." into main

parents dc8a1dfb f0ed3eeb

services/core/java/com/android/server/hdmi/HdmiControlService.java

+4 −2
Original line number Diff line number Diff line
@@ -5306,9 +5306,11 @@ public class HdmiControlService extends SystemService { 
        Display display = getContext().getDisplay();

        if (display != null) {

            DeviceProductInfo deviceProductInfo = display.getDeviceProductInfo();

            if (deviceProductInfo != null) {

                manufacturerPnpId = deviceProductInfo.getManufacturerPnpId();

                manufactureYear = deviceProductInfo.getManufactureYear();

            }

        }

        int enumLogReason =

                HdmiStatsEnums.LOG_REASON_POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_TOGGLE_UNKNOWN;

        if (playback() != null) {