From f3eaf31e3ba4f912768b39aece5c6f235d262223 Mon Sep 17 00:00:00 2001
From: Devin Moore <devinmoore@google.com>
Date: Mon, 17 Aug 2020 13:49:38 -0700
Subject: [PATCH] Clean up android.hardware.common types

Removed unnecessary 'flags' and 'fdIndex' fields from GrantorDescriptor.
Added additional comments for clarity.

Test: builds
Bug: 142326204
Change-Id: Id818ceb593ba2837d56dbfb3351d2127ec50b7ed
---
 .../android/hardware/common/GrantorDescriptor.aidl    |  2 --
 .../android/hardware/common/GrantorDescriptor.aidl    | 11 +++++++++--
 common/aidl/android/hardware/common/MQDescriptor.aidl |  5 +++++
 3 files changed, 14 insertions(+), 4 deletions(-)

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 4a9ecd9ba6..07bceb0e06 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 442d7fa55c..3552e9e847 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 1126a25e9e..899768890e 100644
--- a/common/aidl/android/hardware/common/MQDescriptor.aidl
+++ b/common/aidl/android/hardware/common/MQDescriptor.aidl
@@ -18,6 +18,11 @@ package android.hardware.common;
 
 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 {
     /*