| commit | c26ba2dd218c39b94e6bdc59ff2e669878627103 | [log] [tgz] |
|---|---|---|
| author | Devin Moore <devinmoore@google.com> | Tue Aug 25 22:53:38 2020 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Aug 25 22:53:38 2020 +0000 |
| tree | 50925c42dcec8d9c4bdc12b58718b7ef9f74b666 | |
| parent | bf31c055f500d7323a5c3f9a8ea291f5eb60393f [diff] | |
| parent | f3eaf31e3ba4f912768b39aece5c6f235d262223 [diff] |
Merge "Clean up android.hardware.common types"
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 { /*