Merge "Define common types that shall be used for engine configuration in both HAL and framework."
diff --git a/keystore2/aidl/aidl_api/android.system.keystore2/current/android/system/keystore2/ResponseCode.aidl b/keystore2/aidl/aidl_api/android.system.keystore2/current/android/system/keystore2/ResponseCode.aidl
index bbeb5d2..23f535e 100644
--- a/keystore2/aidl/aidl_api/android.system.keystore2/current/android/system/keystore2/ResponseCode.aidl
+++ b/keystore2/aidl/aidl_api/android.system.keystore2/current/android/system/keystore2/ResponseCode.aidl
@@ -47,4 +47,5 @@
INVALID_ARGUMENT = 20,
TOO_MUCH_DATA = 21,
OUT_OF_KEYS = 22,
+ OUT_OF_KEYS_REQUIRES_UPGRADE = 23,
}
diff --git a/keystore2/aidl/android/system/keystore2/ResponseCode.aidl b/keystore2/aidl/android/system/keystore2/ResponseCode.aidl
index f23b8d8..d815d4e 100644
--- a/keystore2/aidl/android/system/keystore2/ResponseCode.aidl
+++ b/keystore2/aidl/android/system/keystore2/ResponseCode.aidl
@@ -87,4 +87,13 @@
* available. This can be thrown during attempts to generate a key.
*/
OUT_OF_KEYS = 22,
+
+ /**
+ * This device needs a software update as it may contain potentially vulnerable software.
+ * This error is returned only on devices that rely solely on remotely-provisioned keys (see
+ * <a href=
+ * "https://android-developers.googleblog.com/2022/03/upgrading-android-attestation-remote.html"
+ * >Remote Key Provisioning</a>).
+ */
+ OUT_OF_KEYS_REQUIRES_UPGRADE = 23,
}
diff --git a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl b/media/aidl/android/media/audio/common/AudioFormatDescription.aidl
index 57f2bdb..c174885 100644
--- a/media/aidl/android/media/audio/common/AudioFormatDescription.aidl
+++ b/media/aidl/android/media/audio/common/AudioFormatDescription.aidl
@@ -59,9 +59,9 @@
* IEC-61937. Note that 'type == NON_PCM' in this case.
*
* Encoding names mostly follow IANA standards for media types (MIME), and
- * frameworks/av/media/libstagefright/foundation/MediaDefs.cpp with the
- * latter having priority. Since there are still many audio types not found
- * in any of these lists, the following rules are applied:
+ * frameworks/av/media/module/foundation/MediaDefs.cpp with the latter
+ * having priority. Since there are still many audio types not found in any
+ * of these lists, the following rules are applied:
*
* - If there is a direct MIME type for the encoding, the MIME type name
* is used as is, e.g. "audio/eac3" for the EAC-3 format.
