diff options
11 files changed, 15 insertions, 15 deletions
diff --git a/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java b/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java index 2c1a7d5d18e6..15ec486f989b 100644 --- a/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java +++ b/services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java @@ -85,7 +85,7 @@ final class DelayedMessageBuffer { void processAllMessages() { // Use the copied buffer. - ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<HdmiCecMessage>(mBuffer); + ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<>(mBuffer); mBuffer.clear(); for (HdmiCecMessage message : copiedBuffer) { mDevice.onMessage(message); @@ -104,7 +104,7 @@ final class DelayedMessageBuffer { * are associated with */ void processMessagesForDevice(int address) { - ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<HdmiCecMessage>(mBuffer); + ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<>(mBuffer); mBuffer.clear(); HdmiLogger.debug("Checking message for address:" + address); for (HdmiCecMessage message : copiedBuffer) { @@ -134,7 +134,7 @@ final class DelayedMessageBuffer { * @param address logical address of the device to be the active source */ void processActiveSource(int address) { - ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<HdmiCecMessage>(mBuffer); + ArrayList<HdmiCecMessage> copiedBuffer = new ArrayList<>(mBuffer); mBuffer.clear(); for (HdmiCecMessage message : copiedBuffer) { if (message.getOpcode() == Constants.MESSAGE_ACTIVE_SOURCE diff --git a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java index db8dedbf12cc..b75e75feabb3 100755 --- a/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java +++ b/services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java @@ -386,6 +386,7 @@ final class DeviceDiscoveryAction extends HdmiCecFeatureAction { return; case STATE_WAITING_FOR_VENDOR_ID: queryVendorId(address); + return; default: return; } diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java index a1753e58c4ea..8a146397fa3e 100644 --- a/services/core/java/com/android/server/hdmi/HdmiControlService.java +++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java @@ -96,7 +96,7 @@ public class HdmiControlService extends SystemService { static final String PERMISSION = "android.permission.HDMI_CEC"; - // The reason code to initiate intializeCec(). + // The reason code to initiate initializeCec(). static final int INITIATED_BY_ENABLE_CEC = 0; static final int INITIATED_BY_BOOT_UP = 1; static final int INITIATED_BY_SCREEN_ON = 2; diff --git a/services/core/java/com/android/server/hdmi/HdmiLogger.java b/services/core/java/com/android/server/hdmi/HdmiLogger.java index ebe52c0dfbf0..2309293dcbd7 100644 --- a/services/core/java/com/android/server/hdmi/HdmiLogger.java +++ b/services/core/java/com/android/server/hdmi/HdmiLogger.java @@ -17,7 +17,6 @@ package com.android.server.hdmi; import android.annotation.Nullable; -import android.os.Build; import android.os.SystemClock; import android.util.Pair; import android.util.Slog; @@ -41,7 +40,7 @@ import java.util.HashMap; final class HdmiLogger { private static final String TAG = "HDMI"; // Logging duration for same error message. - private static final long ERROR_LOG_DURATTION_MILLIS = 20 * 1000; // 20s + private static final long ERROR_LOG_DURATION_MILLIS = 20 * 1000; // 20s private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -134,6 +133,6 @@ final class HdmiLogger { } private static boolean shouldLogNow(@Nullable Pair<Long, Integer> timing, long curTime) { - return timing == null || curTime - timing.first > ERROR_LOG_DURATTION_MILLIS; + return timing == null || curTime - timing.first > ERROR_LOG_DURATION_MILLIS; } } diff --git a/services/core/java/com/android/server/hdmi/HdmiUtils.java b/services/core/java/com/android/server/hdmi/HdmiUtils.java index 4ac3bba73e25..2a8117fac68d 100644 --- a/services/core/java/com/android/server/hdmi/HdmiUtils.java +++ b/services/core/java/com/android/server/hdmi/HdmiUtils.java @@ -114,7 +114,7 @@ final class HdmiUtils { * * @param logicalAddress the logical address to verify * @param deviceType the device type to check - * @throw IllegalArgumentException + * @throws IllegalArgumentException */ static void verifyAddressType(int logicalAddress, int deviceType) { int actualDeviceType = getTypeFromAddress(logicalAddress); diff --git a/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java b/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java index 6893012342f9..a62d0b63221c 100644 --- a/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java +++ b/services/core/java/com/android/server/hdmi/PowerStatusMonitorAction.java @@ -38,7 +38,7 @@ public class PowerStatusMonitorAction extends HdmiCecFeatureAction { private static final int INVALID_POWER_STATUS = POWER_STATUS_UNKNOWN - 1; // Monitoring interval (60s) - private static final int MONITIROING_INTERNAL_MS = 60000; + private static final int MONITORING_INTERNAL_MS = 60000; // Timeout once sending <Give Device Power Status> private static final int REPORT_POWER_STATUS_TIMEOUT_MS = 5000; @@ -132,7 +132,7 @@ public class PowerStatusMonitorAction extends HdmiCecFeatureAction { mState = STATE_WAIT_FOR_REPORT_POWER_STATUS; // Add both timers, monitoring and timeout. - addTimer(STATE_WAIT_FOR_NEXT_MONITORING, MONITIROING_INTERNAL_MS); + addTimer(STATE_WAIT_FOR_NEXT_MONITORING, MONITORING_INTERNAL_MS); addTimer(STATE_WAIT_FOR_REPORT_POWER_STATUS, REPORT_POWER_STATUS_TIMEOUT_MS); } diff --git a/services/core/java/com/android/server/hdmi/RequestArcAction.java b/services/core/java/com/android/server/hdmi/RequestArcAction.java index 75a79cb0213c..c70101c43d79 100644 --- a/services/core/java/com/android/server/hdmi/RequestArcAction.java +++ b/services/core/java/com/android/server/hdmi/RequestArcAction.java @@ -35,7 +35,7 @@ abstract class RequestArcAction extends HdmiCecFeatureAction { * * @param source {@link HdmiCecLocalDevice} instance * @param avrAddress address of AV receiver. It should be AUDIO_SYSTEM type - * @throw IllegalArugmentException if device type of sourceAddress and avrAddress + * @throws IllegalArgumentException if device type of sourceAddress and avrAddress * is invalid */ RequestArcAction(HdmiCecLocalDevice source, int avrAddress) { diff --git a/services/core/java/com/android/server/hdmi/SystemAudioAction.java b/services/core/java/com/android/server/hdmi/SystemAudioAction.java index 449b2085715c..a5477e865c40 100644 --- a/services/core/java/com/android/server/hdmi/SystemAudioAction.java +++ b/services/core/java/com/android/server/hdmi/SystemAudioAction.java @@ -60,7 +60,7 @@ abstract class SystemAudioAction extends HdmiCecFeatureAction { * @param avrAddress logical address of AVR device * @param targetStatus Whether to enable the system audio mode or not * @param callback callback interface to be notified when it's done - * @throw IllegalArugmentException if device type of sourceAddress and avrAddress is invalid + * @throws IllegalArgumentException if device type of sourceAddress and avrAddress is invalid */ SystemAudioAction(HdmiCecLocalDevice source, int avrAddress, boolean targetStatus, IHdmiControlCallback callback) { diff --git a/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java b/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java index eb5119b8a233..6ddff91a70f7 100644 --- a/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java +++ b/services/core/java/com/android/server/hdmi/SystemAudioActionFromAvr.java @@ -32,7 +32,7 @@ final class SystemAudioActionFromAvr extends SystemAudioAction { * @param avrAddress logical address of AVR device * @param targetStatus Whether to enable the system audio mode or not * @param callback callback interface to be notified when it's done - * @throw IllegalArugmentException if device type of tvAddress and avrAddress is invalid + * @throws IllegalArgumentException if device type of tvAddress and avrAddress is invalid */ SystemAudioActionFromAvr(HdmiCecLocalDevice source, int avrAddress, boolean targetStatus, IHdmiControlCallback callback) { diff --git a/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java b/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java index 02ecd1392bc7..5c0c272f59e0 100644 --- a/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java +++ b/services/core/java/com/android/server/hdmi/SystemAudioActionFromTv.java @@ -32,7 +32,7 @@ final class SystemAudioActionFromTv extends SystemAudioAction { * @param avrAddress logical address of AVR device * @param targetStatus Whether to enable the system audio mode or not * @param callback callback interface to be notified when it's done - * @throw IllegalArugmentException if device type of tvAddress is invalid + * @throws IllegalArgumentException if device type of tvAddress is invalid */ SystemAudioActionFromTv(HdmiCecLocalDevice sourceAddress, int avrAddress, boolean targetStatus, IHdmiControlCallback callback) { diff --git a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java index d41a36ca031f..13f0f4ae4a92 100644 --- a/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java +++ b/services/core/java/com/android/server/hdmi/SystemAudioStatusAction.java @@ -64,7 +64,7 @@ final class SystemAudioStatusAction extends HdmiCecFeatureAction { } private void handleSendGiveAudioStatusFailure() { - // Inform to all application that the audio status (volumn, mute) of + // Inform to all application that the audio status (volume, mute) of // the audio amplifier is unknown. tv().setAudioStatus(false, Constants.UNKNOWN_VOLUME); |