Merge "Revert "Get HDMI CEC physical address with service thread, so TIF can get it for Player."" am: de8f4b28ee am: 72cbd9351c

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

Change-Id: Ie0e2cf9d4e63770212b8f18d0755fe9f41ab8e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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() {
+            synchronized (mLock) {
-                @Override
+                return mHdmiCecNetwork.getPhysicalAddress();
-                public void run() {
+            }
-                    synchronized (mLock) {
-                        mPhysicalAddress = mHdmiCecNetwork.getPhysicalAddress();
-                    }
-                }
-            });
-            return mPhysicalAddress;
         }
 
         @Override