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

Commit 6a2f935e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use HdmiProperties for ro.hdmi.set_menu_language"

parents 3f4dde80 bfb30768

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

+0 −4
Original line number Diff line number Diff line
@@ -394,14 +394,10 @@ final class Constants { 
    static final String PROPERTY_PREFERRED_ADDRESS_PLAYBACK = "persist.sys.hdmi.addr.playback";

    static final String PROPERTY_PREFERRED_ADDRESS_TV = "persist.sys.hdmi.addr.tv";





    // TODO(OEM): Set this to false to keep the playback device in sleep upon hotplug event.

    //            True by default.

    static final String PROPERTY_WAKE_ON_HOTPLUG = "ro.hdmi.wake_on_hotplug";



    // TODO(OEM): Set this to true to enable 'Set Menu Language' feature. False by default.

    static final String PROPERTY_SET_MENU_LANGUAGE = "ro.hdmi.set_menu_language";



    /**

     * Property to save the ARC port id on system audio device.

     * <p>When ARC is initiated, this port will be used to turn on ARC.

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

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.os.PowerManager; 
import android.os.PowerManager.WakeLock;

import android.os.SystemProperties;

import android.provider.Settings.Global;

import android.sysprop.HdmiProperties;

import android.util.Slog;



import com.android.internal.annotations.VisibleForTesting;
@@ -47,7 +48,7 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource { 
            SystemProperties.getBoolean(Constants.PROPERTY_WAKE_ON_HOTPLUG, true);



    private static final boolean SET_MENU_LANGUAGE =

            SystemProperties.getBoolean(Constants.PROPERTY_SET_MENU_LANGUAGE, false);

            HdmiProperties.set_menu_language().orElse(false);



    // Used to keep the device awake while it is the active source. For devices that

    // cannot wake up via CEC commands, this address the inconvenience of having to