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

Commit b077db92 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player."" am: de8f4b28 am: 72cbd935 am: 5fe190fb am: 40eca5ac

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



Change-Id: Ide9eb95ef0eb5fb9f2e6357875fec9ee3c2b1804
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 892cdd7a 40eca5ac

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

+3 −13
Original line number Diff line number Diff line
@@ -266,10 +266,6 @@ 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.

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

        public int getPhysicalAddress() {

            initBinderCall();

            runOnServiceThread(new Runnable() {

                @Override

                public void run() {

            synchronized (mLock) {

                        mPhysicalAddress = mHdmiCecNetwork.getPhysicalAddress();

                    }

                return mHdmiCecNetwork.getPhysicalAddress();

            }

            });

            return mPhysicalAddress;

        }



        @Override