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

Commit 25bd066f authored by RD Babiera's avatar RD Babiera Committed by Android (Google) Code Review
Browse files

Merge changes from topic "usb-dp-dumpsys" into udc-qpr-dev 

* changes:
  usb: Add DisplayPort alt mode status to dumpsys usb
  usb: improve DisplayPortAltModeInfo logging clarity
parents 3ee9defc 56d6d4b5

core/java/android/hardware/usb/DisplayPortAltModeInfo.java

+31 −7
Original line number Diff line number Diff line
@@ -200,19 +200,43 @@ public final class DisplayPortAltModeInfo implements Parcelable { 
        dest.writeInt(mLinkTrainingStatus);

    }



    private String displayPortAltModeStatusToString(@DisplayPortAltModeStatus int status) {

        switch (status) {

            case DISPLAYPORT_ALT_MODE_STATUS_NOT_CAPABLE:

                return "not capable";

            case DISPLAYPORT_ALT_MODE_STATUS_CAPABLE_DISABLED:

                return "capable disabled";

            case DISPLAYPORT_ALT_MODE_STATUS_ENABLED:

                return "enabled";

            default:

                return "unknown";

        }

    }



    private String linkTrainingStatusToString(@LinkTrainingStatus int status) {

        switch (status) {

            case LINK_TRAINING_STATUS_SUCCESS:

                return "success";

            case LINK_TRAINING_STATUS_FAILURE:

                return "failure";

            default:

                return "unknown";

        }

    }



    @NonNull

    @Override

    public String toString() {

        return "DisplayPortAltModeInfo{partnerSink="

                + mPartnerSinkStatus

                + " cable="

                + mCableStatus

                + " numLanes="

                + displayPortAltModeStatusToString(mPartnerSinkStatus)

                + ", cable="

                + displayPortAltModeStatusToString(mCableStatus)

                + ", numLanes="

                + mNumLanes

                + " hotPlugDetect="

                + ", hotPlugDetect="

                + mHotPlugDetect

                + " linkTrainingStatus="

                + mLinkTrainingStatus

                + ", linkTrainingStatus="

                + linkTrainingStatusToString(mLinkTrainingStatus)

                + "}";

    }

core/java/com/android/internal/usb/DumpUtils.java

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.internal.usb;



import static android.hardware.usb.UsbPort.FLAG_ALT_MODE_TYPE_DISPLAYPORT;

import static android.hardware.usb.UsbPortStatus.MODE_AUDIO_ACCESSORY;

import static android.hardware.usb.UsbPortStatus.MODE_DEBUG_ACCESSORY;

import static android.hardware.usb.UsbPortStatus.MODE_DFP;
@@ -26,6 +27,7 @@ import static android.hardware.usb.UsbPortStatus.MODE_UFP; 
import static com.android.internal.util.dump.DumpUtils.writeStringIfNotNull;



import android.annotation.NonNull;

import android.hardware.usb.DisplayPortAltModeInfo;

import android.hardware.usb.UsbAccessory;

import android.hardware.usb.UsbConfiguration;

import android.hardware.usb.UsbDevice;
@@ -177,6 +179,10 @@ public class DumpUtils { 
        dump.write("supports_compliance_warnings",

                UsbPortProto.SUPPORTS_COMPLIANCE_WARNINGS,

                port.supportsComplianceWarnings());

        if (port.isAltModeSupported(FLAG_ALT_MODE_TYPE_DISPLAYPORT)) {

            dump.write("supported_alt_modes", UsbPortProto.SUPPORTED_ALT_MODES,

                    FLAG_ALT_MODE_TYPE_DISPLAYPORT);

        }



        dump.end(token);

    }
@@ -255,6 +261,12 @@ public class DumpUtils { 
                UsbPort.powerBrickConnectionStatusToString(status.getPowerBrickConnectionStatus()));

        dump.write("compliance_warning_status", UsbPortStatusProto.COMPLIANCE_WARNINGS_STRING,

                UsbPort.complianceWarningsToString(status.getComplianceWarnings()));

        DisplayPortAltModeInfo displayPortAltModeInfo = status.getDisplayPortAltModeInfo();

        if (displayPortAltModeInfo != null) {

            dump.write("displayport_alt_mode_status",

                    UsbPortStatusProto.DISPLAYPORT_ALT_MODE_STATUS,

                    status.getDisplayPortAltModeInfo().toString());

        }

        dump.end(token);

    }

}

core/proto/android/service/usb.proto

+6 −0
Original line number Diff line number Diff line
@@ -238,10 +238,15 @@ message UsbPortProto { 
        MODE_DEBUG_ACCESSORY = 8;

    }



    enum AltMode {

        ALT_MODE_DISPLAYPORT = 1;

    }



    // ID of the port. A device (eg: Chromebooks) might have multiple ports.

    optional string id = 1;

    repeated Mode supported_modes = 2;

    optional bool supports_compliance_warnings = 3;

    repeated AltMode supported_alt_modes = 4;

}



message UsbPortStatusProto {
@@ -271,6 +276,7 @@ message UsbPortStatusProto { 
    optional bool is_power_transfer_limited = 8;

    optional string usb_power_brick_status = 9;

    optional string compliance_warnings_string = 10;

    optional string displayport_alt_mode_status = 11;

}



message UsbPortStatusRoleCombinationProto {