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

Commit a7481481 authored by Nathalie Le Clair's avatar Nathalie Le Clair Committed by Automerger Merge Worker
Browse files

Merge "HDMI: Rename Hdmi HAL to HdmiConnection" am: 4ac49b63 am: e18b410d am: fbffb605 

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



Change-Id: I6dd8fcb7cb07f41048aac7be8d17d70fe7cf3631
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c1d5c436 fbffb605

services/core/Android.bp

+2 −2
Original line number Original line Diff line number Diff line
@@ -158,8 +158,8 @@ java_library_static { 
        "android.hardware.health-translate-java",

        "android.hardware.health-translate-java",

        "android.hardware.light-V1-java",

        "android.hardware.light-V1-java",

        "android.hardware.tv.cec-V1.1-java",

        "android.hardware.tv.cec-V1.1-java",

        "android.hardware.tv.cec-V1-java",

        "android.hardware.tv.hdmi.cec-V1-java",

        "android.hardware.tv.hdmi-V1-java",

        "android.hardware.tv.hdmi.connection-V1-java",

        "android.hardware.weaver-V1.0-java",

        "android.hardware.weaver-V1.0-java",

        "android.hardware.weaver-V2-java",

        "android.hardware.weaver-V2-java",

        "android.hardware.biometrics.face-V1.0-java",

        "android.hardware.biometrics.face-V1.0-java",

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

+25 −24
Original line number Original line Diff line number Diff line
@@ -19,16 +19,16 @@ package com.android.server.hdmi; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.hdmi.HdmiPortInfo;

import android.hardware.tv.cec.CecMessage;

import android.hardware.tv.cec.IHdmiCec;

import android.hardware.tv.cec.IHdmiCecCallback;

import android.hardware.tv.cec.V1_0.HotplugEvent;

import android.hardware.tv.cec.V1_0.HotplugEvent;

import android.hardware.tv.cec.V1_0.IHdmiCec.getPhysicalAddressCallback;

import android.hardware.tv.cec.V1_0.IHdmiCec.getPhysicalAddressCallback;

import android.hardware.tv.cec.V1_0.OptionKey;

import android.hardware.tv.cec.V1_0.OptionKey;

import android.hardware.tv.cec.V1_0.Result;

import android.hardware.tv.cec.V1_0.Result;

import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.hardware.tv.cec.V1_0.SendMessageResult;

import android.hardware.tv.hdmi.IHdmi;

import android.hardware.tv.hdmi.cec.CecMessage;

import android.hardware.tv.hdmi.IHdmiCallback;

import android.hardware.tv.hdmi.cec.IHdmiCec;

import android.hardware.tv.hdmi.cec.IHdmiCecCallback;

import android.hardware.tv.hdmi.connection.IHdmiConnection;

import android.hardware.tv.hdmi.connection.IHdmiConnectionCallback;

import android.icu.util.IllformedLocaleException;

import android.icu.util.IllformedLocaleException;

import android.icu.util.ULocale;

import android.icu.util.ULocale;

import android.os.Binder;

import android.os.Binder;
@@ -184,7 +184,7 @@ final class HdmiCecController { 
        if (controller != null) {

        if (controller != null) {

            return controller;

            return controller;

        }

        }

        HdmiLogger.warning("Unable to use CEC and HDMI AIDL HALs");

        HdmiLogger.warning("Unable to use CEC and HDMI Connection AIDL HALs");





        controller = createWithNativeWrapper(service, new NativeWrapperImpl11(), atomWriter);

        controller = createWithNativeWrapper(service, new NativeWrapperImpl11(), atomWriter);

        if (controller != null) {

        if (controller != null) {
@@ -911,14 +911,14 @@ final class HdmiCecController { 
    private static final class NativeWrapperImplAidl

    private static final class NativeWrapperImplAidl

            implements NativeWrapper, IBinder.DeathRecipient {

            implements NativeWrapper, IBinder.DeathRecipient {

        private IHdmiCec mHdmiCec;

        private IHdmiCec mHdmiCec;

        private IHdmi mHdmi;

        private IHdmiConnection mHdmiConnection;

        @Nullable private HdmiCecCallback mCallback;

        @Nullable private HdmiCecCallback mCallback;





        private final Object mLock = new Object();

        private final Object mLock = new Object();





        @Override

        @Override

        public String nativeInit() {

        public String nativeInit() {

            return connectToHal() ? mHdmiCec.toString() + " " + mHdmi.toString() : null;

            return connectToHal() ? mHdmiCec.toString() + " " + mHdmiConnection.toString() : null;

        }

        }





        boolean connectToHal() {

        boolean connectToHal() {
@@ -935,15 +935,15 @@ final class HdmiCecController { 
                HdmiLogger.error("Couldn't link to death : ", e);

                HdmiLogger.error("Couldn't link to death : ", e);

            }

            }





            mHdmi =

            mHdmiConnection =

                    IHdmi.Stub.asInterface(

                    IHdmiConnection.Stub.asInterface(

                            ServiceManager.getService(IHdmi.DESCRIPTOR + "/default"));

                            ServiceManager.getService(IHdmiConnection.DESCRIPTOR + "/default"));

            if (mHdmi == null) {

            if (mHdmiConnection == null) {

                HdmiLogger.error("Could not initialize HDMI AIDL HAL");

                HdmiLogger.error("Could not initialize HDMI Connection AIDL HAL");

                return false;

                return false;

            }

            }

            try {

            try {

                mHdmi.asBinder().linkToDeath(this, 0);

                mHdmiConnection.asBinder().linkToDeath(this, 0);

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                HdmiLogger.error("Couldn't link to death : ", e);

                HdmiLogger.error("Couldn't link to death : ", e);

            }

            }
@@ -954,8 +954,8 @@ final class HdmiCecController { 
        public void binderDied() {

        public void binderDied() {

            // One of the services died, try to reconnect to both.

            // One of the services died, try to reconnect to both.

            mHdmiCec.asBinder().unlinkToDeath(this, 0);

            mHdmiCec.asBinder().unlinkToDeath(this, 0);

            mHdmi.asBinder().unlinkToDeath(this, 0);

            mHdmiConnection.asBinder().unlinkToDeath(this, 0);

            HdmiLogger.error("HDMI or CEC service died, reconnecting");

            HdmiLogger.error("HDMI Connection or CEC service died, reconnecting");

            connectToHal();

            connectToHal();

            // Reconnect the callback

            // Reconnect the callback

            if (mCallback != null) {

            if (mCallback != null) {
@@ -974,7 +974,7 @@ final class HdmiCecController { 
            }

            }

            try {

            try {

                // Create an AIDL callback that can callback onHotplugEvent

                // Create an AIDL callback that can callback onHotplugEvent

                mHdmi.setCallback(new HdmiCallbackAidl(callback));

                mHdmiConnection.setCallback(new HdmiConnectionCallbackAidl(callback));

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                HdmiLogger.error("Couldn't initialise tv.hdmi callback : ", e);

                HdmiLogger.error("Couldn't initialise tv.hdmi callback : ", e);

            }

            }
@@ -1091,10 +1091,11 @@ final class HdmiCecController { 
        @Override

        @Override

        public HdmiPortInfo[] nativeGetPortInfos() {

        public HdmiPortInfo[] nativeGetPortInfos() {

            try {

            try {

                android.hardware.tv.hdmi.HdmiPortInfo[] hdmiPortInfos = mHdmi.getPortInfo();

                android.hardware.tv.hdmi.connection.HdmiPortInfo[] hdmiPortInfos =

                        mHdmiConnection.getPortInfo();

                HdmiPortInfo[] hdmiPortInfo = new HdmiPortInfo[hdmiPortInfos.length];

                HdmiPortInfo[] hdmiPortInfo = new HdmiPortInfo[hdmiPortInfos.length];

                int i = 0;

                int i = 0;

                for (android.hardware.tv.hdmi.HdmiPortInfo portInfo : hdmiPortInfos) {

                for (android.hardware.tv.hdmi.connection.HdmiPortInfo portInfo : hdmiPortInfos) {

                    hdmiPortInfo[i] =

                    hdmiPortInfo[i] =

                            new HdmiPortInfo(

                            new HdmiPortInfo(

                                    portInfo.portId,

                                    portInfo.portId,
@@ -1116,7 +1117,7 @@ final class HdmiCecController { 
        @Override

        @Override

        public boolean nativeIsConnected(int port) {

        public boolean nativeIsConnected(int port) {

            try {

            try {

                return mHdmi.isConnected(port);

                return mHdmiConnection.isConnected(port);

            } catch (RemoteException e) {

            } catch (RemoteException e) {

                HdmiLogger.error("Failed to get connection info : ", e);

                HdmiLogger.error("Failed to get connection info : ", e);

                return false;

                return false;
@@ -1624,10 +1625,10 @@ final class HdmiCecController { 
        }

        }

    }

    }





    private static final class HdmiCallbackAidl extends IHdmiCallback.Stub {

    private static final class HdmiConnectionCallbackAidl extends IHdmiConnectionCallback.Stub {

        private final HdmiCecCallback mHdmiCecCallback;

        private final HdmiCecCallback mHdmiCecCallback;





        HdmiCallbackAidl(HdmiCecCallback hdmiCecCallback) {

        HdmiConnectionCallbackAidl(HdmiCecCallback hdmiCecCallback) {

            mHdmiCecCallback = hdmiCecCallback;

            mHdmiCecCallback = hdmiCecCallback;

        }

        }
@@ -1638,12 +1639,12 @@ final class HdmiCecController { 




        @Override

        @Override

        public synchronized String getInterfaceHash() throws android.os.RemoteException {

        public synchronized String getInterfaceHash() throws android.os.RemoteException {

            return IHdmiCallback.Stub.HASH;

            return IHdmiConnectionCallback.Stub.HASH;

        }

        }





        @Override

        @Override

        public int getInterfaceVersion() throws android.os.RemoteException {

        public int getInterfaceVersion() throws android.os.RemoteException {

            return IHdmiCallback.Stub.VERSION;

            return IHdmiConnectionCallback.Stub.VERSION;

        }

        }

    }

    }