| commit | b28642199f571265eae97ba8a6488f8745cd0552 | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Wed Aug 26 00:37:11 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 00:37:11 2020 +0000 |
| tree | 21ecea18d82d686e655d6dd420d0d8e35ec46e59 | |
| parent | 1790d8c313a1d941b1e0f1877665187caedc4969 [diff] | |
| parent | bcf7751dcd8a9e6a82d5e3ff9021b7906c75c555 [diff] |
Merge "Clean up android.hardware.common types" am: c26ba2dd21 am: bcf7751dcd Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1402395 Change-Id: Ia4352e919f18876c5e7294c3f69f46c923f82776
diff --git a/common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl b/common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl index 4a9ecd9..07bceb0 100644 --- a/common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl +++ b/common/aidl/aidl_api/android.hardware.common/current/android/hardware/common/GrantorDescriptor.aidl
@@ -18,8 +18,6 @@ package android.hardware.common; @VintfStability parcelable GrantorDescriptor { - int flags; - int fdIndex; int offset; long extent; }
diff --git a/common/aidl/android/hardware/common/GrantorDescriptor.aidl b/common/aidl/android/hardware/common/GrantorDescriptor.aidl index 442d7fa..3552e9e 100644 --- a/common/aidl/android/hardware/common/GrantorDescriptor.aidl +++ b/common/aidl/android/hardware/common/GrantorDescriptor.aidl
@@ -16,10 +16,17 @@ package android.hardware.common; +/* + * Included in MQDescriptor, for use with libfmq. + */ @VintfStability parcelable GrantorDescriptor { - int flags; - int fdIndex; + /* + * The offset of this descriptor in the shared memory in bytes. + */ int offset; + /* + * The size of this descriptor in bytes. + */ long extent; }
diff --git a/common/aidl/android/hardware/common/MQDescriptor.aidl b/common/aidl/android/hardware/common/MQDescriptor.aidl index 1126a25..8997688 100644 --- a/common/aidl/android/hardware/common/MQDescriptor.aidl +++ b/common/aidl/android/hardware/common/MQDescriptor.aidl
@@ -18,6 +18,11 @@ import android.hardware.common.GrantorDescriptor; +/* + * For use with libfmq. This is created from an instance of AidlMessageQueue, + * and is used to pass information required to create another instance of that + * queue for fast communication. + */ @VintfStability parcelable MQDescriptor { /*