From 8fd474d1abd614bc90b218effa6da9d79ff0ba0a Mon Sep 17 00:00:00 2001 From: Gregory Montoir Date: Wed, 28 Sep 2022 04:34:18 +0000 Subject: [PATCH] Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player." This reverts commit 75fbb23955859402ad5e4fa5023a79edec4d460a. Reason for revert: ag/20027273/comment/ae6b1273_1c5220c5/ Change-Id: I292e093f0e8f7843c8da09c28a48ab7250a5721e --- .../android/server/hdmi/HdmiControlService.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index 7d35fc5c8bd58..f8a74f4f3f554 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -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 mPhysicalAddress; + synchronized (mLock) { + return mHdmiCecNetwork.getPhysicalAddress(); + } } @Override