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

Merge changes I9d4649ee,I454a6d22,Icaf172a5,Ib21162d7,I120801fd

Browse Source 
* changes:
  Fix crash on TV device from casting error.
  When device reboots, it should not go to real standby.
  Use : hex format for HdmiCecMessage.toString
  Improve CEC logging
  Complete the HDMI_SYSTEM_AUDIO_CONTROL_ENABLED control logic in Audio System device.
This commit is contained in:
Shubang Lu
2019-01-16 01:49:35 +00:00
committed by Android (Google) Code Review
parent d706a9df5e 2fc3ab6d6f
commit 7dcdca64e8
6 changed files with 133 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java
View File

@@ -91,7 +91,7 @@ final class DeviceDiscoveryAction extends HdmiCecFeatureAction {
private final DeviceDiscoveryCallback mCallback;
private int mProcessedDeviceCount = 0;
private int mTimeoutRetry = 0;
private boolean mIsTvDevice = source().mService.isTvDevice();
private boolean mIsTvDevice = localDevice().mService.isTvDevice();
private final int mDelayPeriod;
/**

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

@@ -77,7 +77,7 @@ final class HdmiCecController {
private static final int NUM_LOGICAL_ADDRESS = 16;
private static final int MAX_CEC_MESSAGE_HISTORY = 20;
private static final int MAX_CEC_MESSAGE_HISTORY = 200;
// Predicate for whether the given logical address is remote device's one or not.
private final Predicate<Integer> mRemoteDeviceAddressPredicate = new Predicate<Integer>() {
@@ -682,7 +682,7 @@ final class HdmiCecController {
void dump(final IndentingPrintWriter pw) {
for (int i = 0; i < mLocalDevices.size(); ++i) {
pw.println("HdmiCecLocalDevice #" + i + ":");
pw.println("HdmiCecLocalDevice #" + mLocalDevices.keyAt(i) + ":");
pw.increaseIndent();
mLocalDevices.valueAt(i).dump(pw);
pw.decreaseIndent();

39
services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
View File

@@ -37,6 +37,7 @@ import android.util.SparseArray;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.hdmi.Constants.AudioCodec;
import com.android.server.hdmi.DeviceDiscoveryAction.DeviceDiscoveryCallback;
import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
@@ -89,12 +90,10 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
protected HdmiCecLocalDeviceAudioSystem(HdmiControlService service) {
super(service, HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM);
mSystemAudioControlFeatureEnabled = true;
// TODO(amyjojo) make System Audio Control controllable by users
/*mSystemAudioControlFeatureEnabled =
mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, true);*/
mRoutingControlFeatureEnabled =
mService.readBooleanSetting(Global.HDMI_CEC_SWITCH_ENABLED, true);
mSystemAudioControlFeatureEnabled =
mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, true);
// TODO(amyjojo): make the map ro property.
mTvInputs.put(Constants.CEC_SWITCH_HDMI1,
"com.droidlogic.tvinput/.services.Hdmi1InputService/HW5");
@@ -275,7 +274,7 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
int systemAudioOnPowerOnProp, boolean lastSystemAudioControlStatus) {
if ((systemAudioOnPowerOnProp == ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON)
|| ((systemAudioOnPowerOnProp == USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON)
&& lastSystemAudioControlStatus)) {
&& lastSystemAudioControlStatus && isSystemAudioControlFeatureEnabled())) {
addAndStartAction(new SystemAudioInitiationActionFromAvr(this));
}
}
@@ -408,8 +407,11 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
@ServiceThreadOnly
protected boolean handleGiveAudioStatus(HdmiCecMessage message) {
assertRunOnServiceThread();
reportAudioStatus(message.getSource());
if (isSystemAudioControlFeatureEnabled()) {
reportAudioStatus(message.getSource());
} else {
mService.maySendFeatureAbortCommand(message, Constants.ABORT_REFUSED);
}
return true;
}
@@ -776,6 +778,13 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
HdmiLogger.debug("[A]UpdateSystemAudio mode[on=%b] output=[%X]", on, device);
}
void onSystemAduioControlFeatureSupportChanged(boolean enabled) {
setSystemAudioControlFeatureEnabled(enabled);
if (enabled) {
addAndStartAction(new SystemAudioInitiationActionFromAvr(this));
}
}
@ServiceThreadOnly
void setSystemAudioControlFeatureEnabled(boolean enabled) {
assertRunOnServiceThread();
@@ -1078,4 +1087,20 @@ public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDeviceSource {
}
mDeviceInfos.clear();
}
@Override
protected void dump(IndentingPrintWriter pw) {
pw.println("HdmiCecLocalDeviceAudioSystem:");
pw.increaseIndent();
pw.println("mSystemAudioActivated: " + mSystemAudioActivated);
pw.println("mSystemAudioControlFeatureEnabled: " + mSystemAudioControlFeatureEnabled);
pw.println("mTvSystemAudioModeSupport: " + mTvSystemAudioModeSupport);
pw.println("mArcEstablished: " + mArcEstablished);
pw.println("mArcIntentUsed: " + mArcIntentUsed);
HdmiUtils.dumpMap(pw, "mTvInputs:", mTvInputs);
HdmiUtils.dumpSparseArray(pw, "mDeviceInfos:", mDeviceInfos);
pw.decreaseIndent();
super.dump(pw);
}
}

7
services/core/java/com/android/server/hdmi/HdmiCecMessage.java
View File

@@ -112,12 +112,11 @@ public final class HdmiCecMessage {
@Override
public String toString() {
StringBuffer s = new StringBuffer();
s.append(String.format("<%s> src: %d, dst: %d",
opcodeToString(mOpcode), mSource, mDestination));
s.append(String.format("<%s> %X%X:%02X",
opcodeToString(mOpcode), mSource, mDestination, mOpcode));
if (mParams.length > 0) {
s.append(", params:");
for (byte data : mParams) {
s.append(String.format(" %02X", data));
s.append(String.format(":%02X", data));
}
}
return s.toString();

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

@@ -26,6 +26,7 @@ import static com.android.server.hdmi.Constants.OPTION_MHL_ENABLE;
import static com.android.server.hdmi.Constants.OPTION_MHL_INPUT_SWITCHING;
import static com.android.server.hdmi.Constants.OPTION_MHL_POWER_CHARGE;
import static com.android.server.hdmi.Constants.OPTION_MHL_SERVICE_CONTROL;
import static com.android.server.power.ShutdownThread.SHUTDOWN_ACTION_PROPERTY;
import android.annotation.Nullable;
import android.content.BroadcastReceiver;
@@ -184,9 +185,10 @@ public class HdmiControlService extends SystemService {
@Override
public void onReceive(Context context, Intent intent) {
assertRunOnServiceThread();
boolean isReboot = SystemProperties.get(SHUTDOWN_ACTION_PROPERTY).contains("1");
switch (intent.getAction()) {
case Intent.ACTION_SCREEN_OFF:
if (isPowerOnOrTransient()) {
if (isPowerOnOrTransient() && !isReboot) {
onStandby(STANDBY_SCREEN_OFF);
}
break;
@@ -202,7 +204,7 @@ public class HdmiControlService extends SystemService {
}
break;
case Intent.ACTION_SHUTDOWN:
if (isPowerOnOrTransient()) {
if (isPowerOnOrTransient() && !isReboot) {
onStandby(STANDBY_SHUTDOWN);
}
break;
@@ -610,6 +612,9 @@ public class HdmiControlService extends SystemService {
if (isTvDeviceEnabled()) {
tv().setSystemAudioControlFeatureEnabled(enabled);
}
if (isAudioSystemDevice()) {
audioSystem().onSystemAduioControlFeatureSupportChanged(enabled);
}
break;
case Global.HDMI_CEC_SWITCH_ENABLED:
if (isAudioSystemDevice()) {
@@ -1887,27 +1892,28 @@ public class HdmiControlService extends SystemService {
if (!DumpUtils.checkDumpPermission(getContext(), TAG, writer)) return;
final IndentingPrintWriter pw = new IndentingPrintWriter(writer, " ");
pw.println("mHdmiControlEnabled: " + mHdmiControlEnabled);
pw.println("mProhibitMode: " + mProhibitMode);
if (mCecController != null) {
pw.println("mCecController: ");
pw.increaseIndent();
mCecController.dump(pw);
pw.decreaseIndent();
}
pw.println("mPowerStatus: " + mPowerStatus);
// System settings
pw.println("System_settings:");
pw.increaseIndent();
pw.println("mHdmiControlEnabled: " + mHdmiControlEnabled);
pw.println("mMhlInputChangeEnabled: " + mMhlInputChangeEnabled);
pw.decreaseIndent();
pw.println("mMhlController: ");
pw.increaseIndent();
mMhlController.dump(pw);
pw.decreaseIndent();
pw.println("mPortInfo: ");
pw.increaseIndent();
for (HdmiPortInfo hdmiPortInfo : mPortInfo) {
pw.println("- " + hdmiPortInfo);
HdmiUtils.dumpIterable(pw, "mPortInfo:", mPortInfo);
if (mCecController != null) {
pw.println("mCecController: ");
pw.increaseIndent();
mCecController.dump(pw);
pw.decreaseIndent();
}
pw.decreaseIndent();
pw.println("mPowerStatus: " + mPowerStatus);
}
}

74
services/core/java/com/android/server/hdmi/HdmiUtils.java
View File

@@ -20,9 +20,13 @@ import android.hardware.hdmi.HdmiDeviceInfo;
import android.util.Slog;
import android.util.SparseArray;
import com.android.internal.util.IndentingPrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
/**
* Various utilities to handle HDMI CEC messages.
@@ -317,4 +321,74 @@ final class HdmiUtils {
info.getPhysicalAddress(), info.getPortId(), info.getDeviceType(),
info.getVendorId(), info.getDisplayName(), newPowerStatus);
}
/**
* Dump a {@link SparseArray} to the print writer.
*
* <p>The dump is formatted:
* <pre>
* name:
* key = value
* key = value
* ...
* </pre>
*/
static <T> void dumpSparseArray(IndentingPrintWriter pw, String name,
SparseArray<T> sparseArray) {
printWithTrailingColon(pw, name);
pw.increaseIndent();
int size = sparseArray.size();
for (int i = 0; i < size; i++) {
int key = sparseArray.keyAt(i);
T value = sparseArray.get(key);
pw.printPair(Integer.toString(key), value);
pw.println();
}
pw.decreaseIndent();
}
private static void printWithTrailingColon(IndentingPrintWriter pw, String name) {
pw.println(name.endsWith(":") ? name : name.concat(":"));
}
/**
* Dump a {@link Map} to the print writer.
*
* <p>The dump is formatted:
* <pre>
* name:
* key = value
* key = value
* ...
* </pre>
*/
static <K, V> void dumpMap(IndentingPrintWriter pw, String name, Map<K, V> map) {
printWithTrailingColon(pw, name);
pw.increaseIndent();
for (Map.Entry<K, V> entry: map.entrySet()) {
pw.printPair(entry.getKey().toString(), entry.getValue());
pw.println();
}
pw.decreaseIndent();
}
/**
* Dump a {@link Map} to the print writer.
*
* <p>The dump is formatted:
* <pre>
* name:
* value
* value
* ...
* </pre>
*/
static <T> void dumpIterable(IndentingPrintWriter pw, String name, Iterable<T> values) {
printWithTrailingColon(pw, name);
pw.increaseIndent();
for (T value : values) {
pw.println(value);
}
pw.decreaseIndent();
}
}