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

Commit 34d358c3 authored by Badhri Jagan Sridharan's avatar Badhri Jagan Sridharan
Browse files

Add test commands to spoof presence of contaminants 

This CL simulates contaminant presence through simulated port.

1. Add a port: dumpsys usb add-port "matrix" ufp
2. Set contaminant presence to true: dumpsys usb set-contaminant-status "matrix" true
3. Set contaminant presence to false: dumpsys usb set-contaminant-status "matrix" false

Bug: 119642987
Bug: 117330206
Bug: 77606903
Test: Made sure that dumpsys usb reflected the correct contaminant
status.
Change-Id: Iadb0ea92db65afdb25dbd32c02d9fb778bd4ec8c
parent cd9a661c

services/usb/java/com/android/server/usb/UsbPortManager.java

+21 −0
Original line number Diff line number Diff line
@@ -497,6 +497,27 @@ public class UsbPortManager { 
        }

    }



    /**

     * Sets contaminant status for simulated USB port objects.

     */

    public void simulateContaminantStatus(String portId, boolean detected,

            IndentingPrintWriter pw) {

        synchronized (mLock) {

            final RawPortInfo portInfo = mSimulatedPorts.get(portId);

            if (portInfo == null) {

                pw.println("Simulated port not found.");

                return;

            }



            pw.println("Simulating wet port: portId=" + portId

                    + ", wet=" + detected);

            portInfo.contaminantDetectionStatus = detected

                    ? UsbPortStatus.CONTAMINANT_DETECTION_DETECTED

                    : UsbPortStatus.CONTAMINANT_DETECTION_NOT_DETECTED;

            updatePortsLocked(pw, null);

        }

    }



    public void disconnectSimulatedPort(String portId, IndentingPrintWriter pw) {

        synchronized (mLock) {

            final RawPortInfo portInfo = mSimulatedPorts.get(portId);

services/usb/java/com/android/server/usb/UsbService.java

+14 −0
Original line number Diff line number Diff line
@@ -762,6 +762,15 @@ public class UsbService extends IUsbManager.Stub { 
                    mPortManager.dump(new DualDumpOutputStream(new IndentingPrintWriter(pw, "  ")),

                            "", 0);

                }

            } else if ("set-contaminant-status".equals(args[0]) && args.length == 3) {

                final String portId = args[1];

                final Boolean wet = Boolean.parseBoolean(args[2]);

                if (mPortManager != null) {

                    mPortManager.simulateContaminantStatus(portId, wet, pw);

                    pw.println();

                    mPortManager.dump(new DualDumpOutputStream(new IndentingPrintWriter(pw, "  ")),

                            "", 0);

                }

            } else if ("ports".equals(args[0]) && args.length == 1) {

                if (mPortManager != null) {

                    mPortManager.dump(new DualDumpOutputStream(new IndentingPrintWriter(pw, "  ")),
@@ -806,6 +815,11 @@ public class UsbService extends IUsbManager.Stub { 
                pw.println("  dumpsys usb connect-port \"matrix\" ufp sink device");

                pw.println("  dumpsys usb reset");

                pw.println();

                pw.println("Example simulate contaminant status:");

                pw.println("  dumpsys usb add-port \"matrix\" ufp");

                pw.println("  dumpsys usb set-contaminant-status \"matrix\" true");

                pw.println("  dumpsys usb set-contaminant-status \"matrix\" false");

                pw.println();

                pw.println("Example USB device descriptors:");

                pw.println("  dumpsys usb dump-descriptors -dump-short");

                pw.println("  dumpsys usb dump-descriptors -dump-tree");