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

Merge "Remove some hdmi ro properties" am: 5bfe628d0b am: 4a52b8ee57 am: 885c7ef77c am: 9f443b268d

Browse Source 
Change-Id: I4e47de7a86fbd6b6930f43f8e8b970cf660f6a8b
This commit is contained in:
Treehugger Robot
2020-04-13 18:51:46 +00:00
committed by Automerger Merge Worker
parent b033dcb19d 9f443b268d
commit ca4974437b
2 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,6 @@ import android.hardware.tv.cec.V1_0.SendMessageResult;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.MessageQueue; import android.os.MessageQueue;
import android.os.SystemProperties;
import android.util.Slog; import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
@@ -117,18 +116,10 @@ final class HdmiCecController {
private final NativeWrapper mNativeWrapperImpl; private final NativeWrapper mNativeWrapperImpl;
/** List of logical addresses that should not be assigned to the current device.
*
* <p>Parsed from {@link Constants#PROPERTY_HDMI_CEC_NEVER_ASSIGN_LOGICAL_ADDRESSES}
*/
private final List<Integer> mNeverAssignLogicalAddresses;
// Private constructor. Use HdmiCecController.create(). // Private constructor. Use HdmiCecController.create().
private HdmiCecController(HdmiControlService service, NativeWrapper nativeWrapper) { private HdmiCecController(HdmiControlService service, NativeWrapper nativeWrapper) {
mService = service; mService = service;
mNativeWrapperImpl = nativeWrapper; mNativeWrapperImpl = nativeWrapper;
mNeverAssignLogicalAddresses = mService.getIntList(SystemProperties.get(
Constants.PROPERTY_HDMI_CEC_NEVER_ASSIGN_LOGICAL_ADDRESSES));
} }
/** /**
@@ -221,8 +212,7 @@ final class HdmiCecController {
for (int i = 0; i < NUM_LOGICAL_ADDRESS; ++i) { for (int i = 0; i < NUM_LOGICAL_ADDRESS; ++i) {
int curAddress = (startAddress + i) % NUM_LOGICAL_ADDRESS; int curAddress = (startAddress + i) % NUM_LOGICAL_ADDRESS;
if (curAddress != Constants.ADDR_UNREGISTERED if (curAddress != Constants.ADDR_UNREGISTERED
&& deviceType == HdmiUtils.getTypeFromAddress(curAddress) && deviceType == HdmiUtils.getTypeFromAddress(curAddress)) {
&& !mNeverAssignLogicalAddresses.contains(curAddress)) {
boolean acked = false; boolean acked = false;
for (int j = 0; j < HdmiConfig.ADDRESS_ALLOCATION_RETRY; ++j) { for (int j = 0; j < HdmiConfig.ADDRESS_ALLOCATION_RETRY; ++j) {
if (sendPollMessage(curAddress, curAddress, 1)) { if (sendPollMessage(curAddress, curAddress, 1)) {

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

@@ -181,10 +181,6 @@ public class HdmiControlService extends SystemService {
@GuardedBy("mLock") @GuardedBy("mLock")
private boolean mSystemAudioActivated = false; private boolean mSystemAudioActivated = false;
private static final boolean isHdmiCecNeverClaimPlaybackLogicAddr =
SystemProperties.getBoolean(
Constants.PROPERTY_HDMI_CEC_NEVER_CLAIM_PLAYBACK_LOGICAL_ADDRESS, false);
/** /**
* Interface to report send result. * Interface to report send result.
*/ */
@@ -772,8 +768,7 @@ public class HdmiControlService extends SystemService {
// A container for [Device type, Local device info]. // A container for [Device type, Local device info].
ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>(); ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>();
for (int type : mLocalDevices) { for (int type : mLocalDevices) {
if (type == HdmiDeviceInfo.DEVICE_PLAYBACK if (type == HdmiDeviceInfo.DEVICE_PLAYBACK) {
&& isHdmiCecNeverClaimPlaybackLogicAddr) {
continue; continue;
} }
HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type); HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);
@@ -1190,8 +1185,7 @@ public class HdmiControlService extends SystemService {
} }
ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>(); ArrayList<HdmiCecLocalDevice> localDevices = new ArrayList<>();
for (int type : mLocalDevices) { for (int type : mLocalDevices) {
if (type == HdmiDeviceInfo.DEVICE_PLAYBACK if (type == HdmiDeviceInfo.DEVICE_PLAYBACK) {
&& isHdmiCecNeverClaimPlaybackLogicAddr) {
continue; continue;
} }
HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type); HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(type);