Merge "graphics: Base resource classes need virtual dtor"
diff --git a/media/bufferpool/2.0/IAccessor.hal b/media/bufferpool/2.0/IAccessor.hal
index 66707fe..b889518 100644
--- a/media/bufferpool/2.0/IAccessor.hal
+++ b/media/bufferpool/2.0/IAccessor.hal
@@ -67,6 +67,7 @@
* to get shared buffers from the buffer pool.
* @return connectionId Id of IConnection. The Id identifies
* sender and receiver in FMQ messages during buffer transfer.
+ * @return msgId Id of the most recent message from buffer pool.
* @return toFmqDesc FMQ descriptor. The descriptor is used to
* post buffer status messages.
* @return fromFmqDesc FMQ descriptor. The descriptor is used to
@@ -75,6 +76,7 @@
connect(IObserver observer)
generates (ResultStatus status, IConnection connection,
int64_t connectionId,
+ uint32_t msgId,
fmq_sync<BufferStatusMessage> toFmqDesc,
fmq_unsync<BufferInvalidationMessage> fromFmqDesc);
};
diff --git a/media/bufferpool/2.0/IObserver.hal b/media/bufferpool/2.0/IObserver.hal
index a998836..62f247e 100644
--- a/media/bufferpool/2.0/IObserver.hal
+++ b/media/bufferpool/2.0/IObserver.hal
@@ -29,6 +29,7 @@
* message.
*
* @param connectionId the connection Id of the specific buffer pool client
+ * @param msgId Id of the most recent message
*/
- oneway onMessage(int64_t connectionId);
+ oneway onMessage(int64_t connectionId, uint32_t msgId);
};
diff --git a/media/c2/1.0/Android.bp b/media/c2/1.0/Android.bp
index c37c22b..3c99b6a 100644
--- a/media/c2/1.0/Android.bp
+++ b/media/c2/1.0/Android.bp
@@ -17,8 +17,10 @@
"IInputSurfaceConnection.hal",
],
interfaces: [
- "android.hardware.graphics.bufferqueue@1.0",
+ "android.hardware.graphics.bufferqueue@2.0",
"android.hardware.graphics.common@1.0",
+ "android.hardware.graphics.common@1.1",
+ "android.hardware.graphics.common@1.2",
"android.hardware.media.bufferpool@2.0",
"android.hardware.media.omx@1.0",
"android.hardware.media@1.0",
diff --git a/media/c2/1.0/IComponent.hal b/media/c2/1.0/IComponent.hal
index 7fd551f..822b24e 100644
--- a/media/c2/1.0/IComponent.hal
+++ b/media/c2/1.0/IComponent.hal
@@ -16,7 +16,7 @@
package android.hardware.media.c2@1.0;
-import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;
+import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;
import android.hardware.media.omx@1.0::IGraphicBufferSource;
import IConfigurable;
diff --git a/media/c2/1.0/IInputSurface.hal b/media/c2/1.0/IInputSurface.hal
index 25c6c8e..0a1b56d 100644
--- a/media/c2/1.0/IInputSurface.hal
+++ b/media/c2/1.0/IInputSurface.hal
@@ -16,7 +16,7 @@
package android.hardware.media.c2@1.0;
-import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;
+import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;
import IConfigurable;
diff --git a/wifi/supplicant/1.2/ISupplicantStaNetwork.hal b/wifi/supplicant/1.2/ISupplicantStaNetwork.hal
index 0bba096..85b233d 100644
--- a/wifi/supplicant/1.2/ISupplicantStaNetwork.hal
+++ b/wifi/supplicant/1.2/ISupplicantStaNetwork.hal
@@ -50,6 +50,18 @@
GCMP_256 = 1 << 8,
};
+ /** Possble mask of values for GroupMgmtCipher param. */
+ enum GroupMgmtCipherMask : uint32_t {
+ /** BIP_GMAC-128 Group Management Cipher */
+ BIP_GMAC_128 = 1 << 11,
+
+ /** BIP_GMAC-256 Group Management Cipher */
+ BIP_GMAC_256 = 1 << 12,
+
+ /** BIP_CMAC-256 Group Management Cipher */
+ BIP_CMAC_256 = 1 << 13,
+ };
+
/**
* Set key management mask for the network.
*
@@ -133,6 +145,34 @@
bitfield<GroupCipherMask> groupCipherMask);
/**
+ * Set group management cipher mask for the network.
+ *
+ * @param groupMgmtCipherMask value to set.
+ * Combination of |GroupMgmtCipherMask| values.
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_ARGS_INVALID|,
+ * |SupplicantStatusCode.FAILURE_UNKNOWN|,
+ * |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+ */
+ setGroupMgmtCipher(bitfield<GroupMgmtCipherMask> groupMgmtCipherMask)
+ generates (SupplicantStatus status);
+
+ /**
+ * Get the group management cipher mask set for the network.
+ *
+ * @return status Status of the operation.
+ * Possible status codes:
+ * |SupplicantStatusCode.SUCCESS|,
+ * |SupplicantStatusCode.FAILURE_NETWORK_INVALID|
+ * @return groupMgmtCipherMask Combination of |GroupMgmtCipherMask| values.
+ */
+ getGroupMgmtCipher()
+ generates (SupplicantStatus status,
+ bitfield<GroupMgmtCipherMask> groupMgmtCipherMask);
+
+ /**
* Enable TLS Suite-B in EAP Phase1
*
* @param enable Set to true to enable TLS Suite-B in EAP phase1