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

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

Merge "Get HDMI CEC physical address with service thread, so TIF can get it... 

Merge "Get HDMI CEC physical address with service thread, so TIF can get it for Player." am: 3f2521f1 am: 0fc13761 am: 5c123fb1

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



Change-Id: I7ed7cc127d2992aa029228e436bf8f0ccd369e4b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b8636b5 5c123fb1

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

+13 −3
Original line number Diff line number Diff line
@@ -266,6 +266,10 @@ public class HdmiControlService extends SystemService { 
    // Make sure HdmiCecConfig is instantiated and the XMLs are read.

    private HdmiCecConfig mHdmiCecConfig;



    // Last return value of getPhysicalAddress(). Only updated on calls of getPhysicalAddress().

    // Does not represent the current physical address at all times. Not to be used as a cache.

    private int mPhysicalAddress = Constants.INVALID_PHYSICAL_ADDRESS;



    /**

     * Interface to report send result.

     */
@@ -2080,9 +2084,15 @@ public class HdmiControlService extends SystemService { 
        @Override

        public int getPhysicalAddress() {

            initBinderCall();

            runOnServiceThread(new Runnable() {

                @Override

                public void run() {

                    synchronized (mLock) {

                return mHdmiCecNetwork.getPhysicalAddress();

                        mPhysicalAddress = mHdmiCecNetwork.getPhysicalAddress();

                    }

                }

            });

            return mPhysicalAddress;

        }



        @Override