| commit | af040241aa480896735de4b4632285604ada1413 | [log] [tgz] |
|---|---|---|
| author | Avichal Rakesh <arakesh@google.com> | Mon Feb 06 21:21:05 2023 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Feb 06 21:21:05 2023 +0000 |
| tree | ce527fa3de3ea31129537735d8257a25cf171cfc | |
| parent | 88fe0d5d685415f4c6d1c7bc263d11732890ccb5 [diff] | |
| parent | e1153030e7f2a91d9fc38ec7d789ff3319a105de [diff] |
Merge "Usb Gadget: Add UVC to Usb Gadget interface"
diff --git a/usb/gadget/aidl/aidl_api/android.hardware.usb.gadget/current/android/hardware/usb/gadget/GadgetFunction.aidl b/usb/gadget/aidl/aidl_api/android.hardware.usb.gadget/current/android/hardware/usb/gadget/GadgetFunction.aidl index c3f26d5..78b79e4 100644 --- a/usb/gadget/aidl/aidl_api/android.hardware.usb.gadget/current/android/hardware/usb/gadget/GadgetFunction.aidl +++ b/usb/gadget/aidl/aidl_api/android.hardware.usb.gadget/current/android/hardware/usb/gadget/GadgetFunction.aidl
@@ -36,11 +36,12 @@ parcelable GadgetFunction { const long NONE = 0; const long ADB = 1; - const long ACCESSORY = 2; - const long MTP = 4; - const long MIDI = 8; - const long PTP = 16; - const long RNDIS = 32; - const long AUDIO_SOURCE = 64; - const long NCM = 1024; + const long ACCESSORY = (1 << 1); + const long MTP = (1 << 2); + const long MIDI = (1 << 3); + const long PTP = (1 << 4); + const long RNDIS = (1 << 5); + const long AUDIO_SOURCE = (1 << 6); + const long UVC = (1 << 7); + const long NCM = (1 << 10); }
diff --git a/usb/gadget/aidl/android/hardware/usb/gadget/GadgetFunction.aidl b/usb/gadget/aidl/android/hardware/usb/gadget/GadgetFunction.aidl index d82b427..dd7ee37 100644 --- a/usb/gadget/aidl/android/hardware/usb/gadget/GadgetFunction.aidl +++ b/usb/gadget/aidl/android/hardware/usb/gadget/GadgetFunction.aidl
@@ -51,6 +51,10 @@ */ const long AUDIO_SOURCE = 1 << 6; /** + * UVC - Universal Video Class function. + */ + const long UVC = 1 << 7; + /** * NCM - NCM function. */ const long NCM = 1 << 10;