Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Treehugger Robot
2022-09-28 09:24:00 +00:00
committed by Gerrit Code Review
parent 5df912d6f5 8fd474d1ab
commit de8f4b28ee
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/hdmi/HdmiControlService.java
View File

@@ -266,10 +266,6 @@ public class HdmiControlService extends SystemService {
// Make sure HdmiCecConfig is instantiated and the XMLs are read. // Make sure HdmiCecConfig is instantiated and the XMLs are read.
private HdmiCecConfig mHdmiCecConfig; 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. * Interface to report send result.
*/ */
@@ -2084,16 +2080,10 @@ public class HdmiControlService extends SystemService {
@Override @Override
public int getPhysicalAddress() { public int getPhysicalAddress() {
initBinderCall(); initBinderCall();
runOnServiceThread(new Runnable() {
@Override
public void run() {
synchronized (mLock) { synchronized (mLock) {
mPhysicalAddress = mHdmiCecNetwork.getPhysicalAddress(); return mHdmiCecNetwork.getPhysicalAddress();
} }
} }
});
return mPhysicalAddress;
}
@Override @Override
public void setSystemAudioMode(final boolean enabled, final IHdmiControlCallback callback) { public void setSystemAudioMode(final boolean enabled, final IHdmiControlCallback callback) {