Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cf81ca1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "cleanup: correct typos and fix some warnings"

parents 7899339a a3f5950b

services/core/java/com/android/server/hdmi/DelayedMessageBuffer.java

+3 −3
Original line number Diff line number Diff line
@@ -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

services/core/java/com/android/server/hdmi/DeviceDiscoveryAction.java

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ final class DeviceDiscoveryAction extends HdmiCecFeatureAction { 
                return;

            case STATE_WAITING_FOR_VENDOR_ID:

                queryVendorId(address);

                return;

            default:

                return;

        }

services/core/java/com/android/server/hdmi/HdmiControlService.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

services/core/java/com/android/server/hdmi/HdmiLogger.java

+2 −3
Original line number Diff line number Diff line
@@ -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;

    }

}

services/core/java/com/android/server/hdmi/HdmiUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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);