Cleanup formatting
Test: m -j services.core
Change-Id: I3852261a3ec63c3da97edacc018572e067111abc
(cherry picked from commit 8f68fb3b329c76f575a3aac5135c5b886948c832)
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 1dd10f5..e2db738 100755
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -27,11 +27,9 @@
import android.view.InputDevice;
import android.view.KeyCharacterMap;
import android.view.KeyEvent;
-
import com.android.internal.annotations.GuardedBy;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
-
import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
import java.util.ArrayList;
import java.util.Collections;
@@ -39,8 +37,8 @@
import java.util.List;
/**
- * Class that models a logical CEC device hosted in this system. Handles initialization,
- * CEC commands that call for actions customized per device type.
+ * Class that models a logical CEC device hosted in this system. Handles initialization, CEC
+ * commands that call for actions customized per device type.
*/
abstract class HdmiCecLocalDevice {
private static final String TAG = "HdmiCecLocalDevice";
@@ -69,47 +67,60 @@
public ActiveSource() {
invalidate();
}
+
public ActiveSource(int logical, int physical) {
logicalAddress = logical;
physicalAddress = physical;
}
+
public static ActiveSource of(ActiveSource source) {
return new ActiveSource(source.logicalAddress, source.physicalAddress);
}
+
public static ActiveSource of(int logical, int physical) {
return new ActiveSource(logical, physical);
}
+
public boolean isValid() {
return HdmiUtils.isValidAddress(logicalAddress);
}
+
public void invalidate() {
logicalAddress = Constants.ADDR_INVALID;
physicalAddress = Constants.INVALID_PHYSICAL_ADDRESS;
}
+
public boolean equals(int logical, int physical) {
return logicalAddress == logical && physicalAddress == physical;
}
+
@Override
public boolean equals(Object obj) {
if (obj instanceof ActiveSource) {
ActiveSource that = (ActiveSource) obj;
- return that.logicalAddress == logicalAddress &&
- that.physicalAddress == physicalAddress;
+ return that.logicalAddress == logicalAddress
+ && that.physicalAddress == physicalAddress;
}
return false;
}
+
@Override
public int hashCode() {
return logicalAddress * 29 + physicalAddress;
}
+
@Override
public String toString() {
StringBuffer s = new StringBuffer();
- String logicalAddressString = (logicalAddress == Constants.ADDR_INVALID)
- ? "invalid" : String.format("0x%02x", logicalAddress);
+ String logicalAddressString =
+ (logicalAddress == Constants.ADDR_INVALID)
+ ? "invalid"
+ : String.format("0x%02x", logicalAddress);
s.append("(").append(logicalAddressString);
- String physicalAddressString = (physicalAddress == Constants.INVALID_PHYSICAL_ADDRESS)
- ? "invalid" : String.format("0x%04x", physicalAddress);
+ String physicalAddressString =
+ (physicalAddress == Constants.INVALID_PHYSICAL_ADDRESS)
+ ? "invalid"
+ : String.format("0x%04x", physicalAddress);
s.append(", ").append(physicalAddressString).append(")");
return s.toString();
}
@@ -131,23 +142,24 @@
// Note that access to this collection should happen in service thread.
private final ArrayList<HdmiCecFeatureAction> mActions = new ArrayList<>();
- private final Handler mHandler = new Handler () {
- @Override
- public void handleMessage(Message msg) {
- switch (msg.what) {
- case MSG_DISABLE_DEVICE_TIMEOUT:
- handleDisableDeviceTimeout();
- break;
- case MSG_USER_CONTROL_RELEASE_TIMEOUT:
- handleUserControlReleased();
- break;
- }
- }
- };
+ private final Handler mHandler =
+ new Handler() {
+ @Override
+ public void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_DISABLE_DEVICE_TIMEOUT:
+ handleDisableDeviceTimeout();
+ break;
+ case MSG_USER_CONTROL_RELEASE_TIMEOUT:
+ handleUserControlReleased();
+ break;
+ }
+ }
+ };
/**
- * A callback interface to get notified when all pending action is cleared.
- * It can be called when timeout happened.
+ * A callback interface to get notified when all pending action is cleared. It can be called
+ * when timeout happened.
*/
interface PendingActionClearedCallback {
void onCleared(HdmiCecLocalDevice device);
@@ -165,14 +177,14 @@
// Factory method that returns HdmiCecLocalDevice of corresponding type.
static HdmiCecLocalDevice create(HdmiControlService service, int deviceType) {
switch (deviceType) {
- case HdmiDeviceInfo.DEVICE_TV:
- return new HdmiCecLocalDeviceTv(service);
- case HdmiDeviceInfo.DEVICE_PLAYBACK:
- return new HdmiCecLocalDevicePlayback(service);
- case HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM:
- return new HdmiCecLocalDeviceAudioSystem(service);
- default:
- return null;
+ case HdmiDeviceInfo.DEVICE_TV:
+ return new HdmiCecLocalDeviceTv(service);
+ case HdmiDeviceInfo.DEVICE_PLAYBACK:
+ return new HdmiCecLocalDevicePlayback(service);
+ case HdmiDeviceInfo.DEVICE_AUDIO_SYSTEM:
+ return new HdmiCecLocalDeviceAudioSystem(service);
+ default:
+ return null;
}
}
@@ -183,27 +195,22 @@
mPendingActionClearedCallback = null;
}
- /**
- * Called once a logical address of the local device is allocated.
- */
+ /** Called once a logical address of the local device is allocated. */
protected abstract void onAddressAllocated(int logicalAddress, int reason);
- /**
- * Get the preferred logical address from system properties.
- */
+ /** Get the preferred logical address from system properties. */
protected abstract int getPreferredAddress();
- /**
- * Set the preferred logical address to system properties.
- */
+ /** Set the preferred logical address to system properties. */
protected abstract void setPreferredAddress(int addr);
/**
- * Returns true if the TV input associated with the CEC device is ready
- * to accept further processing such as input switching. This is used
- * to buffer certain CEC commands and process it later if the input is not
- * ready yet. For other types of local devices(non-TV), this method returns
- * true by default to let the commands be processed right away.
+ * Returns true if the TV input associated with the CEC device is ready to accept further
+ * processing such as input switching.
+ *
+ * <p>This is used to buffer certain CEC commands and process it later if the input is not ready
+ * yet. For other types of local devices(non-TV), this method returns true by default to let the
+ * commands be processed right away.
*/
protected boolean isInputReady(int deviceId) {
return true;
@@ -211,7 +218,8 @@
/**
* Returns true if the local device allows the system to be put to standby.
- * The default implementation returns true.
+ *
+ * <p>The default implementation returns true.
*/
protected boolean canGoToStandby() {
return true;
@@ -347,8 +355,9 @@
assertRunOnServiceThread();
int physicalAddress = mService.getPhysicalAddress();
- HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
- mAddress, physicalAddress, mDeviceType);
+ HdmiCecMessage cecMessage =
+ HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
+ mAddress, physicalAddress, mDeviceType);
mService.sendCecCommand(cecMessage, callback);
return true;
}
@@ -357,8 +366,8 @@
protected boolean handleGiveDeviceVendorId(@Nullable SendMessageCallback callback) {
assertRunOnServiceThread();
int vendorId = mService.getVendorId();
- HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
- mAddress, vendorId);
+ HdmiCecMessage cecMessage =
+ HdmiCecMessageBuilder.buildDeviceVendorIdCommand(mAddress, vendorId);
mService.sendCecCommand(cecMessage, callback);
return true;
}
@@ -367,8 +376,9 @@
protected boolean handleGetCecVersion(HdmiCecMessage message) {
assertRunOnServiceThread();
int version = mService.getCecVersion();
- HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildCecVersion(message.getDestination(),
- message.getSource(), version);
+ HdmiCecMessage cecMessage =
+ HdmiCecMessageBuilder.buildCecVersion(
+ message.getDestination(), message.getSource(), version);
mService.sendCecCommand(cecMessage);
return true;
}
@@ -409,8 +419,9 @@
assertRunOnServiceThread();
// Note that since this method is called after logical address allocation is done,
// mDeviceInfo should not be null.
- HdmiCecMessage cecMessage = HdmiCecMessageBuilder.buildSetOsdNameCommand(
- mAddress, message.getSource(), mDeviceInfo.getDisplayName());
+ HdmiCecMessage cecMessage =
+ HdmiCecMessageBuilder.buildSetOsdNameCommand(
+ mAddress, message.getSource(), mDeviceInfo.getDisplayName());
if (cecMessage != null) {
mService.sendCecCommand(cecMessage);
} else {
@@ -483,7 +494,8 @@
protected boolean handleStandby(HdmiCecMessage message) {
assertRunOnServiceThread();
// Seq #12
- if (mService.isControlEnabled() && !mService.isProhibitMode()
+ if (mService.isControlEnabled()
+ && !mService.isProhibitMode()
&& mService.isPowerOnOrTransient()) {
mService.standby();
return true;
@@ -519,7 +531,8 @@
if (keycode != HdmiCecKeycode.UNSUPPORTED_KEYCODE) {
injectKeyEvent(downTime, KeyEvent.ACTION_DOWN, keycode, keyRepeatCount);
- mHandler.sendMessageDelayed(Message.obtain(mHandler, MSG_USER_CONTROL_RELEASE_TIMEOUT),
+ mHandler.sendMessageDelayed(
+ Message.obtain(mHandler, MSG_USER_CONTROL_RELEASE_TIMEOUT),
FOLLOWER_SAFETY_TIMEOUT);
return true;
}
@@ -541,13 +554,23 @@
}
static void injectKeyEvent(long time, int action, int keycode, int repeat) {
- KeyEvent keyEvent = KeyEvent.obtain(time, time, action, keycode,
- repeat, 0, KeyCharacterMap.VIRTUAL_KEYBOARD, 0, KeyEvent.FLAG_FROM_SYSTEM,
- InputDevice.SOURCE_HDMI, null);
- InputManager.getInstance().injectInputEvent(keyEvent,
- InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
+ KeyEvent keyEvent =
+ KeyEvent.obtain(
+ time,
+ time,
+ action,
+ keycode,
+ repeat,
+ 0,
+ KeyCharacterMap.VIRTUAL_KEYBOARD,
+ 0,
+ KeyEvent.FLAG_FROM_SYSTEM,
+ InputDevice.SOURCE_HDMI,
+ null);
+ InputManager.getInstance()
+ .injectInputEvent(keyEvent, InputManager.INJECT_INPUT_EVENT_MODE_ASYNC);
keyEvent.recycle();
- }
+ }
static boolean isPowerOnOrToggleCommand(HdmiCecMessage message) {
byte[] params = message.getParams();
@@ -577,15 +600,17 @@
}
protected boolean handleGiveDevicePowerStatus(HdmiCecMessage message) {
- mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPowerStatus(
- mAddress, message.getSource(), mService.getPowerStatus()));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildReportPowerStatus(
+ mAddress, message.getSource(), mService.getPowerStatus()));
return true;
}
protected boolean handleMenuRequest(HdmiCecMessage message) {
// Always report menu active to receive Remote Control.
- mService.sendCecCommand(HdmiCecMessageBuilder.buildReportMenuStatus(
- mAddress, message.getSource(), Constants.MENU_STATE_ACTIVATED));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildReportMenuStatus(
+ mAddress, message.getSource(), Constants.MENU_STATE_ACTIVATED));
return true;
}
@@ -594,8 +619,12 @@
}
protected boolean handleVendorCommand(HdmiCecMessage message) {
- if (!mService.invokeVendorCommandListenersOnReceived(mDeviceType, message.getSource(),
- message.getDestination(), message.getParams(), false)) {
+ if (!mService.invokeVendorCommandListenersOnReceived(
+ mDeviceType,
+ message.getSource(),
+ message.getDestination(),
+ message.getParams(),
+ false)) {
// Vendor command listener may not have been registered yet. Respond with
// <Feature Abort> [NOT_IN_CORRECT_MODE] so that the sender can try again later.
mService.maySendFeatureAbortCommand(message, Constants.ABORT_NOT_IN_CORRECT_MODE);
@@ -607,12 +636,12 @@
byte[] params = message.getParams();
int vendorId = HdmiUtils.threeBytesToInt(params);
if (vendorId == mService.getVendorId()) {
- if (!mService.invokeVendorCommandListenersOnReceived(mDeviceType, message.getSource(),
- message.getDestination(), params, true)) {
+ if (!mService.invokeVendorCommandListenersOnReceived(
+ mDeviceType, message.getSource(), message.getDestination(), params, true)) {
mService.maySendFeatureAbortCommand(message, Constants.ABORT_NOT_IN_CORRECT_MODE);
}
- } else if (message.getDestination() != Constants.ADDR_BROADCAST &&
- message.getSource() != Constants.ADDR_UNREGISTERED) {
+ } else if (message.getDestination() != Constants.ADDR_BROADCAST
+ && message.getSource() != Constants.ADDR_UNREGISTERED) {
Slog.v(TAG, "Wrong direct vendor command. Replying with <Feature Abort>");
mService.maySendFeatureAbortCommand(message, Constants.ABORT_UNRECOGNIZED_OPCODE);
} else {
@@ -764,8 +793,8 @@
// Remove all actions matched with the given Class type besides |exception|.
@ServiceThreadOnly
- <T extends HdmiCecFeatureAction> void removeActionExcept(final Class<T> clazz,
- final HdmiCecFeatureAction exception) {
+ <T extends HdmiCecFeatureAction> void removeActionExcept(
+ final Class<T> clazz, final HdmiCecFeatureAction exception) {
assertRunOnServiceThread();
Iterator<HdmiCecFeatureAction> iter = mActions.iterator();
while (iter.hasNext()) {
@@ -793,8 +822,7 @@
}
}
- void setAutoDeviceOff(boolean enabled) {
- }
+ void setAutoDeviceOff(boolean enabled) {}
/**
* Called when a hot-plug event issued.
@@ -802,8 +830,7 @@
* @param portId id of port where a hot-plug event happened
* @param connected whether to connected or not on the event
*/
- void onHotplug(int portId, boolean connected) {
- }
+ void onHotplug(int portId, boolean connected) {}
final HdmiControlService getService() {
return mService;
@@ -886,34 +913,34 @@
/**
* Called when the system goes to standby mode.
*
- * @param initiatedByCec true if this power sequence is initiated
- * by the reception the CEC messages like <Standby>
- * @param standbyAction Intent action that drives the standby process,
- * either {@link HdmiControlService#STANDBY_SCREEN_OFF} or
- * {@link HdmiControlService#STANDBY_SHUTDOWN}
+ * @param initiatedByCec true if this power sequence is initiated by the reception the CEC
+ * messages like <Standby>
+ * @param standbyAction Intent action that drives the standby process, either {@link
+ * HdmiControlService#STANDBY_SCREEN_OFF} or {@link HdmiControlService#STANDBY_SHUTDOWN}
*/
protected void onStandby(boolean initiatedByCec, int standbyAction) {}
/**
- * Disable device. {@code callback} is used to get notified when all pending
- * actions are completed or timeout is issued.
+ * Disable device. {@code callback} is used to get notified when all pending actions are
+ * completed or timeout is issued.
*
- * @param initiatedByCec true if this sequence is initiated
- * by the reception the CEC messages like <Standby>
+ * @param initiatedByCec true if this sequence is initiated by the reception the CEC messages
+ * like <Standby>
* @param originalCallback callback interface to get notified when all pending actions are
- * cleared
+ * cleared
*/
- protected void disableDevice(boolean initiatedByCec,
- final PendingActionClearedCallback originalCallback) {
- mPendingActionClearedCallback = new PendingActionClearedCallback() {
- @Override
- public void onCleared(HdmiCecLocalDevice device) {
- mHandler.removeMessages(MSG_DISABLE_DEVICE_TIMEOUT);
- originalCallback.onCleared(device);
- }
- };
- mHandler.sendMessageDelayed(Message.obtain(mHandler, MSG_DISABLE_DEVICE_TIMEOUT),
- DEVICE_CLEANUP_TIMEOUT);
+ protected void disableDevice(
+ boolean initiatedByCec, final PendingActionClearedCallback originalCallback) {
+ mPendingActionClearedCallback =
+ new PendingActionClearedCallback() {
+ @Override
+ public void onCleared(HdmiCecLocalDevice device) {
+ mHandler.removeMessages(MSG_DISABLE_DEVICE_TIMEOUT);
+ originalCallback.onCleared(device);
+ }
+ };
+ mHandler.sendMessageDelayed(
+ Message.obtain(mHandler, MSG_DISABLE_DEVICE_TIMEOUT), DEVICE_CLEANUP_TIMEOUT);
}
@ServiceThreadOnly
@@ -952,8 +979,14 @@
int logicalAddress = findKeyReceiverAddress();
if (logicalAddress == Constants.ADDR_INVALID || logicalAddress == mAddress) {
// Don't send key event to invalid device or itself.
- Slog.w(TAG, "Discard key event: " + keyCode + ", pressed:" + isPressed
- + ", receiverAddr=" + logicalAddress);
+ Slog.w(
+ TAG,
+ "Discard key event: "
+ + keyCode
+ + ", pressed:"
+ + isPressed
+ + ", receiverAddr="
+ + logicalAddress);
} else if (!action.isEmpty()) {
action.get(0).processKeyEvent(keyCode, isPressed);
} else if (isPressed) {
@@ -962,8 +995,8 @@
}
/**
- * Returns the logical address of the device which will receive key events via
- * {@link #sendKeyEvent}.
+ * Returns the logical address of the device which will receive key events via {@link
+ * #sendKeyEvent}.
*
* @see #sendKeyEvent(int, boolean)
*/
@@ -973,15 +1006,13 @@
}
void sendUserControlPressedAndReleased(int targetAddress, int cecKeycode) {
- mService.sendCecCommand(HdmiCecMessageBuilder.buildUserControlPressed(
- mAddress, targetAddress, cecKeycode));
- mService.sendCecCommand(HdmiCecMessageBuilder.buildUserControlReleased(
- mAddress, targetAddress));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildUserControlPressed(mAddress, targetAddress, cecKeycode));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildUserControlReleased(mAddress, targetAddress));
}
- /**
- * Dump internal status of HdmiCecLocalDevice object.
- */
+ /** Dump internal status of HdmiCecLocalDevice object. */
protected void dump(final IndentingPrintWriter pw) {
pw.println("mDeviceType: " + mDeviceType);
pw.println("mAddress: " + mAddress);
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index b25287c..631ba48 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -27,8 +27,8 @@
import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
/**
- * Represent a logical device of type {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM} residing in
- * Android system.
+ * Represent a logical device of type {@link HdmiDeviceInfo#DEVICE_AUDIO_SYSTEM} residing in Android
+ * system.
*/
public class HdmiCecLocalDeviceAudioSystem extends HdmiCecLocalDevice {
@@ -42,6 +42,7 @@
// Whether the System Audio Control feature is enabled or not. True by default.
@GuardedBy("mLock")
private boolean mSystemAudioControlFeatureEnabled;
+
protected Integer mSystemAudioSource;
private boolean mTvSystemAudioModeSupport;
@@ -51,7 +52,7 @@
mSystemAudioControlFeatureEnabled = true;
// TODO(amyjojo) make System Audio Control controllable by users
/*mSystemAudioControlFeatureEnabled =
- mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, true);*/
+ mService.readBooleanSetting(Global.HDMI_SYSTEM_AUDIO_CONTROL_ENABLED, true);*/
}
@Override
@@ -61,13 +62,14 @@
mTvSystemAudioModeSupport = false;
// Record the last state of System Audio Control before going to standby
synchronized (mLock) {
- SystemProperties.set(Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,
- mSystemAudioActivated ? "true" : "false");
+ SystemProperties.set(
+ Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,
+ mSystemAudioActivated ? "true" : "false");
}
if (setSystemAudioMode(false)) {
mService.sendCecCommand(
- HdmiCecMessageBuilder.buildSetSystemAudioMode(
- mAddress, Constants.ADDR_BROADCAST, false));
+ HdmiCecMessageBuilder.buildSetSystemAudioMode(
+ mAddress, Constants.ADDR_BROADCAST, false));
}
}
@@ -75,26 +77,27 @@
@ServiceThreadOnly
protected void onAddressAllocated(int logicalAddress, int reason) {
assertRunOnServiceThread();
- mService.sendCecCommand(HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
- mAddress, mService.getPhysicalAddress(), mDeviceType));
- mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
- mAddress, mService.getVendorId()));
- int systemAudioControlOnPowerOnProp = SystemProperties.getInt(
- PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON, ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON);
- boolean lastSystemAudioControlStatus = SystemProperties.getBoolean(
- Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL, true);
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildReportPhysicalAddressCommand(
+ mAddress, mService.getPhysicalAddress(), mDeviceType));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildDeviceVendorIdCommand(mAddress, mService.getVendorId()));
+ int systemAudioControlOnPowerOnProp =
+ SystemProperties.getInt(
+ PROPERTY_SYSTEM_AUDIO_CONTROL_ON_POWER_ON,
+ ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON);
+ boolean lastSystemAudioControlStatus =
+ SystemProperties.getBoolean(Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL, true);
systemAudioControlOnPowerOn(systemAudioControlOnPowerOnProp, lastSystemAudioControlStatus);
startQueuedActions();
}
@VisibleForTesting
protected void systemAudioControlOnPowerOn(
- int systemAudioOnPowerOnProp, boolean lastSystemAudioControlStatus) {
- if ((systemAudioOnPowerOnProp ==
- ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON) ||
- ((systemAudioOnPowerOnProp ==
- USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON) &&
- lastSystemAudioControlStatus)) {
+ int systemAudioOnPowerOnProp, boolean lastSystemAudioControlStatus) {
+ if ((systemAudioOnPowerOnProp == ALWAYS_SYSTEM_AUDIO_CONTROL_ON_POWER_ON)
+ || ((systemAudioOnPowerOnProp == USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON)
+ && lastSystemAudioControlStatus)) {
addAndStartAction(new SystemAudioInitiationActionFromAvr(this));
}
}
@@ -103,16 +106,16 @@
@ServiceThreadOnly
protected int getPreferredAddress() {
assertRunOnServiceThread();
- return SystemProperties.getInt(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,
- Constants.ADDR_UNREGISTERED);
+ return SystemProperties.getInt(
+ Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM, Constants.ADDR_UNREGISTERED);
}
@Override
@ServiceThreadOnly
protected void setPreferredAddress(int addr) {
assertRunOnServiceThread();
- SystemProperties.set(Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM,
- String.valueOf(addr));
+ SystemProperties.set(
+ Constants.PROPERTY_PREFERRED_ADDRESS_AUDIO_SYSTEM, String.valueOf(addr));
}
@Override
@@ -164,8 +167,9 @@
@ServiceThreadOnly
protected boolean handleGiveSystemAudioModeStatus(HdmiCecMessage message) {
assertRunOnServiceThread();
- mService.sendCecCommand(HdmiCecMessageBuilder
- .buildReportSystemAudioMode(mAddress, message.getSource(), mSystemAudioActivated));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildReportSystemAudioMode(
+ mAddress, message.getSource(), mSystemAudioActivated));
return true;
}
@@ -178,8 +182,8 @@
// TODO(b/80296911): Check if port is ready to accept.
// TODO(b/80296911): if both true, activate ARC functinality and
- mService.sendCecCommand(HdmiCecMessageBuilder
- .buildInitiateArc(mAddress, message.getSource()));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildInitiateArc(mAddress, message.getSource()));
// TODO(b/80296911): else, send <Feature Abort>["Unrecongnized opcode"]
return true;
@@ -194,8 +198,8 @@
// TODO(b/80297105): Check is currently in arc.
// TODO(b/80297105): If both true, deactivate ARC functionality and
- mService.sendCecCommand(HdmiCecMessageBuilder
- .buildTerminateArc(mAddress, message.getSource()));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildTerminateArc(mAddress, message.getSource()));
// TODO(b/80297105): else, send <Feature Abort>["Unrecongnized opcode"]
return true;
@@ -211,8 +215,9 @@
return true;
}
- mService.sendCecCommand(HdmiCecMessageBuilder
- .buildSetSystemAudioMode(mAddress, Constants.ADDR_BROADCAST, systemAudioStatusOn));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildSetSystemAudioMode(
+ mAddress, Constants.ADDR_BROADCAST, systemAudioStatusOn));
return true;
}
@@ -244,19 +249,23 @@
int maxVolume = mService.getAudioManager().getStreamMaxVolume(AudioManager.STREAM_MUSIC);
int scaledVolume = VolumeControlAction.scaleToCecVolume(volume, maxVolume);
- mService.sendCecCommand(HdmiCecMessageBuilder
- .buildReportAudioStatus(mAddress, message.getSource(), scaledVolume, mute));
+ mService.sendCecCommand(
+ HdmiCecMessageBuilder.buildReportAudioStatus(
+ mAddress, message.getSource(), scaledVolume, mute));
}
protected boolean setSystemAudioMode(boolean newSystemAudioMode) {
if (!isSystemAudioControlFeatureEnabled()) {
- HdmiLogger.debug("Cannot turn " +
- (newSystemAudioMode ? "on" : "off") + "system audio mode " +
- "because the System Audio Control feature is disabled.");
+ HdmiLogger.debug(
+ "Cannot turn "
+ + (newSystemAudioMode ? "on" : "off")
+ + "system audio mode "
+ + "because the System Audio Control feature is disabled.");
return false;
}
- HdmiLogger.debug("System Audio Mode change[old:%b new:%b]",
- mSystemAudioActivated, newSystemAudioMode);
+ HdmiLogger.debug(
+ "System Audio Mode change[old:%b new:%b]",
+ mSystemAudioActivated, newSystemAudioMode);
// Wake up device if System Audio Control is turned on but device is still on standby
if (newSystemAudioMode && mService.isPowerStandbyOrTransient()) {
mService.wakeUp();
@@ -264,10 +273,15 @@
}
// Mute device when feature is turned off and unmute device when feature is turned on
boolean currentMuteStatus =
- mService.getAudioManager().isStreamMute(AudioManager.STREAM_MUSIC);
+ mService.getAudioManager().isStreamMute(AudioManager.STREAM_MUSIC);
if (currentMuteStatus == newSystemAudioMode) {
- mService.getAudioManager().adjustStreamVolume(AudioManager.STREAM_MUSIC,
- newSystemAudioMode ? AudioManager.ADJUST_UNMUTE : AudioManager.ADJUST_MUTE, 0);
+ mService.getAudioManager()
+ .adjustStreamVolume(
+ AudioManager.STREAM_MUSIC,
+ newSystemAudioMode
+ ? AudioManager.ADJUST_UNMUTE
+ : AudioManager.ADJUST_MUTE,
+ 0);
}
updateAudioManagerForSystemAudio(newSystemAudioMode);
synchronized (mLock) {
@@ -301,7 +315,6 @@
/** {@code supported} is true if the TV is connected and supports System Audio Mode. */
void onResult(boolean supported);
-
}
/**