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

Commit 98328d08 authored by Nathalie Le Clair's avatar Nathalie Le Clair
Browse files

Make naming in Java consistent. 

The Java naming convention prefers the 'Earc' notation, so we should use
that notation consistently.

On the HAL side, there is no preference for the notation, so we keep the
current notation, 'EArc´.

Bug: 265395723
Test: make, atest
Change-Id: I312edbcafe8b734ad6a73abefffaa3ea2f732d62
parent cf80a53f

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

+30 −30
Original line number Diff line number Diff line
@@ -35,40 +35,40 @@ final class HdmiEarcController { 


    private final HdmiControlService mService;



    private EArcNativeWrapper mEArcNativeWrapperImpl;

    private EarcNativeWrapper mEarcNativeWrapperImpl;



    protected interface EArcNativeWrapper {

    protected interface EarcNativeWrapper {

        boolean nativeInit();

        void nativeSetEArcEnabled(boolean enabled);

        boolean nativeIsEArcEnabled();

        void nativeSetEarcEnabled(boolean enabled);

        boolean nativeIsEarcEnabled();

        void nativeSetCallback(EarcAidlCallback callback);

        byte nativeGetState(int portId);

        byte[] nativeGetLastReportedAudioCapabilities(int portId);

    }



    private static final class EArcNativeWrapperImpl implements EArcNativeWrapper,

    private static final class EarcNativeWrapperImpl implements EarcNativeWrapper,

            IBinder.DeathRecipient {

        private IEArc mEArc;

        private EarcAidlCallback mEArcCallback;

        private IEArc mEarc;

        private EarcAidlCallback mEarcCallback;



        @Override

        public void binderDied() {

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

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

            connectToHal();

            if (mEArcCallback != null) {

                nativeSetCallback(mEArcCallback);

            if (mEarcCallback != null) {

                nativeSetCallback(mEarcCallback);

            }

        }



        boolean connectToHal() {

            mEArc =

            mEarc =

                    IEArc.Stub.asInterface(

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

            if (mEArc == null) {

            if (mEarc == null) {

                return false;

            }

            try {

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

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

            } catch (RemoteException e) {

                HdmiLogger.error("Couldn't link callback object: ", e);

            }
@@ -81,9 +81,9 @@ final class HdmiEarcController { 
        }



        @Override

        public void nativeSetEArcEnabled(boolean enabled) {

        public void nativeSetEarcEnabled(boolean enabled) {

            try {

                mEArc.setEArcEnabled(enabled);

                mEarc.setEArcEnabled(enabled);

            } catch (ServiceSpecificException sse) {

                HdmiLogger.error(

                        "Could not set eARC enabled to " + enabled + ". Error: ", sse.errorCode);
@@ -93,9 +93,9 @@ final class HdmiEarcController { 
        }



        @Override

        public boolean nativeIsEArcEnabled() {

        public boolean nativeIsEarcEnabled() {

            try {

                return mEArc.isEArcEnabled();

                return mEarc.isEArcEnabled();

            } catch (RemoteException re) {

                HdmiLogger.error("Could not read if eARC is enabled. Exception: ", re);

                return false;
@@ -104,9 +104,9 @@ final class HdmiEarcController { 


        @Override

        public void nativeSetCallback(EarcAidlCallback callback) {

            mEArcCallback = callback;

            mEarcCallback = callback;

            try {

                mEArc.setCallback(callback);

                mEarc.setCallback(callback);

            } catch (RemoteException re) {

                HdmiLogger.error("Could not set callback. Exception: ", re);

            }
@@ -115,7 +115,7 @@ final class HdmiEarcController { 
        @Override

        public byte nativeGetState(int portId) {

            try {

                return mEArc.getState(portId);

                return mEarc.getState(portId);

            } catch (RemoteException re) {

                HdmiLogger.error("Could not get eARC state. Exception: ", re);

                return -1;
@@ -125,7 +125,7 @@ final class HdmiEarcController { 
        @Override

        public byte[] nativeGetLastReportedAudioCapabilities(int portId) {

            try {

                return mEArc.getLastReportedAudioCapabilities(portId);

                return mEarc.getLastReportedAudioCapabilities(portId);

            } catch (RemoteException re) {

                HdmiLogger.error(

                        "Could not read last reported audio capabilities. Exception: ", re);
@@ -135,9 +135,9 @@ final class HdmiEarcController { 
    }



    // Private constructor. Use HdmiEarcController.create().

    private HdmiEarcController(HdmiControlService service, EArcNativeWrapper nativeWrapper) {

    private HdmiEarcController(HdmiControlService service, EarcNativeWrapper nativeWrapper) {

        mService = service;

        mEArcNativeWrapperImpl = nativeWrapper;

        mEarcNativeWrapperImpl = nativeWrapper;

    }



    /**
@@ -151,14 +151,14 @@ final class HdmiEarcController { 
     *         returns {@code null}.

     */

    static HdmiEarcController create(HdmiControlService service) {

        return createWithNativeWrapper(service, new EArcNativeWrapperImpl());

        return createWithNativeWrapper(service, new EarcNativeWrapperImpl());

    }



    /**

     * A factory method with injection of native methods for testing.

     */

    static HdmiEarcController createWithNativeWrapper(HdmiControlService service,

            EArcNativeWrapper nativeWrapper) {

            EarcNativeWrapper nativeWrapper) {

        HdmiEarcController controller = new HdmiEarcController(service, nativeWrapper);

        if (!controller.init(nativeWrapper)) {

            HdmiLogger.warning("Could not connect to eARC AIDL HAL.");
@@ -167,10 +167,10 @@ final class HdmiEarcController { 
        return controller;

    }



    private boolean init(EArcNativeWrapper nativeWrapper) {

    private boolean init(EarcNativeWrapper nativeWrapper) {

        if (nativeWrapper.nativeInit()) {

            mControlHandler = new Handler(mService.getServiceLooper());

            mEArcNativeWrapperImpl.nativeSetCallback(new EarcAidlCallback());

            mEarcNativeWrapperImpl.nativeSetCallback(new EarcAidlCallback());

            return true;

        }

        return false;
@@ -194,7 +194,7 @@ final class HdmiEarcController { 
    @HdmiAnnotations.ServiceThreadOnly

    void setEarcEnabled(boolean enabled) {

        assertRunOnServiceThread();

        mEArcNativeWrapperImpl.nativeSetEArcEnabled(enabled);

        mEarcNativeWrapperImpl.nativeSetEarcEnabled(enabled);

    }



    /**
@@ -205,7 +205,7 @@ final class HdmiEarcController { 
    @HdmiAnnotations.ServiceThreadOnly

    @Constants.EarcStatus

    int getState(int portId) {

        return mEArcNativeWrapperImpl.nativeGetState(portId);

        return mEarcNativeWrapperImpl.nativeGetState(portId);

    }



    /**
@@ -215,7 +215,7 @@ final class HdmiEarcController { 
     */

    @HdmiAnnotations.ServiceThreadOnly

    byte[] getLastReportedCaps(int portId) {

        return mEArcNativeWrapperImpl.nativeGetLastReportedAudioCapabilities(portId);

        return mEarcNativeWrapperImpl.nativeGetLastReportedAudioCapabilities(portId);

    }



    final class EarcAidlCallback extends IEArcCallback.Stub {

services/tests/servicestests/src/com/android/server/hdmi/FakeEArcNativeWrapper.java→services/tests/servicestests/src/com/android/server/hdmi/FakeEarcNativeWrapper.java

+7 −7
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ package com.android.server.hdmi; 


import android.hardware.tv.hdmi.earc.IEArcStatus;



final class FakeEArcNativeWrapper implements HdmiEarcController.EArcNativeWrapper {

    private static final String TAG = "FakeEArcNativeWrapper";

final class FakeEarcNativeWrapper implements HdmiEarcController.EarcNativeWrapper {

    private static final String TAG = "FakeEarcNativeWrapper";



    private boolean mIsEArcEnabled = true;

    private boolean mIsEarcEnabled = true;



    @Override

    public boolean nativeInit() {
@@ -29,13 +29,13 @@ final class FakeEArcNativeWrapper implements HdmiEarcController.EArcNativeWrappe 
    }



    @Override

    public void nativeSetEArcEnabled(boolean enabled) {

        mIsEArcEnabled = enabled;

    public void nativeSetEarcEnabled(boolean enabled) {

        mIsEarcEnabled = enabled;

    }



    @Override

    public boolean nativeIsEArcEnabled() {

        return mIsEArcEnabled;

    public boolean nativeIsEarcEnabled() {

        return mIsEarcEnabled;

    }



    @Override

services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDeviceTvTest.java

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public class HdmiCecLocalDeviceTvTest { 
    private HdmiCecLocalDeviceTv mHdmiCecLocalDeviceTv;

    private FakeNativeWrapper mNativeWrapper;

    private HdmiEarcController mHdmiEarcController;

    private FakeEArcNativeWrapper mEArcNativeWrapper;

    private FakeEarcNativeWrapper mEarcNativeWrapper;

    private FakePowerManagerWrapper mPowerManager;

    private Looper mMyLooper;

    private TestLooper mTestLooper = new TestLooper();
@@ -187,9 +187,9 @@ public class HdmiCecLocalDeviceTvTest { 
        mHdmiCecController = HdmiCecController.createWithNativeWrapper(

                mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

        mHdmiControlService.setCecController(mHdmiCecController);

        mEArcNativeWrapper = new FakeEArcNativeWrapper();

        mEarcNativeWrapper = new FakeEarcNativeWrapper();

        mHdmiEarcController = HdmiEarcController.createWithNativeWrapper(

                mHdmiControlService, mEArcNativeWrapper);

                mHdmiControlService, mEarcNativeWrapper);

        mHdmiControlService.setEarcController(mHdmiEarcController);

        mHdmiControlService.setHdmiMhlController(HdmiMhlControllerStub.create(mHdmiControlService));

        HdmiPortInfo[] hdmiPortInfos = new HdmiPortInfo[2];

services/tests/servicestests/src/com/android/server/hdmi/HdmiControlServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ public class HdmiControlServiceTest { 
    private MockPlaybackDevice mPlaybackDeviceSpy;

    private FakeNativeWrapper mNativeWrapper;

    private HdmiEarcController mHdmiEarcController;

    private FakeEArcNativeWrapper mEArcNativeWrapper;

    private FakeEarcNativeWrapper mEarcNativeWrapper;

    private FakePowerManagerWrapper mPowerManager;

    private Looper mMyLooper;

    private TestLooper mTestLooper = new TestLooper();
@@ -128,9 +128,9 @@ public class HdmiControlServiceTest { 
        mHdmiCecController = HdmiCecController.createWithNativeWrapper(

                mHdmiControlServiceSpy, mNativeWrapper, mHdmiControlServiceSpy.getAtomWriter());

        mHdmiControlServiceSpy.setCecController(mHdmiCecController);

        mEArcNativeWrapper = new FakeEArcNativeWrapper();

        mEarcNativeWrapper = new FakeEarcNativeWrapper();

        mHdmiEarcController = HdmiEarcController.createWithNativeWrapper(

                mHdmiControlServiceSpy, mEArcNativeWrapper);

                mHdmiControlServiceSpy, mEarcNativeWrapper);

        mHdmiControlServiceSpy.setEarcController(mHdmiEarcController);

        mHdmiControlServiceSpy.setHdmiMhlController(HdmiMhlControllerStub.create(

                mHdmiControlServiceSpy));

services/tests/servicestests/src/com/android/server/hdmi/HdmiEarcLocalDeviceTxTest.java

+3 −3
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class HdmiEarcLocalDeviceTxTest { 
    private HdmiEarcLocalDevice mHdmiEarcLocalDeviceTx;

    private FakeNativeWrapper mNativeWrapper;

    private HdmiEarcController mHdmiEarcController;

    private FakeEArcNativeWrapper mEArcNativeWrapper;

    private FakeEarcNativeWrapper mEarcNativeWrapper;

    private FakePowerManagerWrapper mPowerManager;

    private byte[] mEarcCapabilities = new byte[]{

            0x01, 0x01, 0x1a, 0x35, 0x0f, 0x7f, 0x07, 0x15, 0x07, 0x50, 0x3d, 0x1f, (byte) 0xc0,
@@ -128,9 +128,9 @@ public class HdmiEarcLocalDeviceTxTest { 
        mHdmiCecController = HdmiCecController.createWithNativeWrapper(

                mHdmiControlService, mNativeWrapper, mHdmiControlService.getAtomWriter());

        mHdmiControlService.setCecController(mHdmiCecController);

        mEArcNativeWrapper = new FakeEArcNativeWrapper();

        mEarcNativeWrapper = new FakeEarcNativeWrapper();

        mHdmiEarcController = HdmiEarcController.createWithNativeWrapper(

                mHdmiControlService, mEArcNativeWrapper);

                mHdmiControlService, mEarcNativeWrapper);

        mHdmiControlService.setEarcController(mHdmiEarcController);

        mHdmiControlService.setHdmiMhlController(HdmiMhlControllerStub.create(mHdmiControlService));

        mHdmiControlService.initService();