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

Commit bd1a0547 authored by Paul Colța's avatar Paul Colța Committed by Automerger Merge Worker
Browse files

Merge "HDMICEC: Keep device name empty when OSD name is not set" into udc-dev... 

Merge "HDMICEC: Keep device name empty when OSD name is not set" into udc-dev am: 87f1a12c am: 0968b4ea

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



Change-Id: I03f3e3723ae5a40b2c87f373689d501b0f38fec6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b1a96f31 0968b4ea

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

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ final class NewDeviceAction extends HdmiCecFeatureAction { 
            return;

        }

        if (mDisplayName == null) {

            mDisplayName = HdmiUtils.getDefaultDeviceName(mDeviceLogicalAddress);

            mDisplayName = "";

        }

        HdmiDeviceInfo deviceInfo = HdmiDeviceInfo.cecDeviceBuilder()

                .setLogicalAddress(mDeviceLogicalAddress)