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

Commit 15965408 authored by Kweku Adams's avatar Kweku Adams Committed by android-build-merger
Browse files

Merge "Fixing typo in proto field." into pi-dev am: ce9fe591 

am: 9b68c7aa

Change-Id: I24ed8f1ec83e6539a12a8cd04068a9d2d31886cc
parents 49e63fb6 9b68c7aa

core/proto/android/service/usb.proto

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ message UsbDebuggingManagerProto { 
    option (android.msg_privacy).dest = DEST_AUTOMATIC;



    optional bool connected_to_adb = 1;

    optional string last_key_recevied = 2 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional string last_key_received = 2 [ (android.privacy).dest = DEST_EXPLICIT ];

    optional string user_keys = 3 [ (android.privacy).dest = DEST_LOCAL ];

    optional string system_keys = 4 [ (android.privacy).dest = DEST_LOCAL ];

}

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

+1 −1
Original line number Diff line number Diff line
@@ -461,7 +461,7 @@ public class UsbDebuggingManager { 
        long token = dump.start(idName, id);



        dump.write("connected_to_adb", UsbDebuggingManagerProto.CONNECTED_TO_ADB, mThread != null);

        writeStringIfNotNull(dump, "last_key_received", UsbDebuggingManagerProto.LAST_KEY_RECEVIED,

        writeStringIfNotNull(dump, "last_key_received", UsbDebuggingManagerProto.LAST_KEY_RECEIVED,

                mFingerprints);



        try {