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

Merge "Generalize queryDisplayStatus() to all source devices"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-11-19 16:28:37 +00:00
committed by Android (Google) Code Review
parent 92e72e129d 559d8ed830
commit d0099b0ce1
4 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
View File

@@ -128,25 +128,6 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
String.valueOf(addr));
}
@ServiceThreadOnly
void queryDisplayStatus(IHdmiControlCallback callback) {
assertRunOnServiceThread();
List<DevicePowerStatusAction> actions = getActions(DevicePowerStatusAction.class);
if (!actions.isEmpty()) {
Slog.i(TAG, "queryDisplayStatus already in progress");
actions.get(0).addCallback(callback);
return;
}
DevicePowerStatusAction action = DevicePowerStatusAction.create(this, Constants.ADDR_TV,
callback);
if (action == null) {
Slog.w(TAG, "Cannot initiate queryDisplayStatus");
invokeCallback(callback, HdmiControlManager.RESULT_EXCEPTION);
return;
}
addAndStartAction(action);
}
@Override
@ServiceThreadOnly
void onHotplug(int portId, boolean connected) {

19
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceSource.java
View File

@@ -70,6 +70,25 @@ abstract class HdmiCecLocalDeviceSource extends HdmiCecLocalDevice {
super(service, deviceType);
}
@ServiceThreadOnly
void queryDisplayStatus(IHdmiControlCallback callback) {
assertRunOnServiceThread();
List<DevicePowerStatusAction> actions = getActions(DevicePowerStatusAction.class);
if (!actions.isEmpty()) {
Slog.i(TAG, "queryDisplayStatus already in progress");
actions.get(0).addCallback(callback);
return;
}
DevicePowerStatusAction action = DevicePowerStatusAction.create(this, Constants.ADDR_TV,
callback);
if (action == null) {
Slog.w(TAG, "Cannot initiate queryDisplayStatus");
invokeCallback(callback, HdmiControlManager.RESULT_EXCEPTION);
return;
}
addAndStartAction(action);
}
@Override
@ServiceThreadOnly
void onHotplug(int portId, boolean connected) {

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

@@ -2400,9 +2400,13 @@ public class HdmiControlService extends SystemService {
return;
}
HdmiCecLocalDevicePlayback source = playback();
HdmiCecLocalDeviceSource source = playback();
if (source == null) {
Slog.w(TAG, "Local playback device not available");
source = audioSystem();
}
if (source == null) {
Slog.w(TAG, "Local source device not available");
invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE);
return;
}

14
services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
View File

@@ -1249,6 +1249,20 @@ public class HdmiCecLocalDevicePlaybackTest {
externalDevice.getPhysicalAddress());
}
@Test
public void queryDisplayStatus() {
mHdmiControlService.queryDisplayStatus(new IHdmiControlCallback.Stub() {
@Override
public void onComplete(int result) {
}
});
mTestLooper.dispatchAll();
HdmiCecMessage expectedMessage = HdmiCecMessageBuilder.buildGiveDevicePowerStatus(
mPlaybackLogicalAddress, Constants.ADDR_TV);
assertThat(mNativeWrapper.getResultMessages()).contains(expectedMessage);
}
@Test
public void toggleAndFollowTvPower_ToTv_TvStatusOn() {
mHdmiCecLocalDevicePlayback.mService.getHdmiCecConfig().setStringValue(