summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Kyunglyul Hyun <klhyun@google.com> 2020-09-22 06:41:07 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-09-22 06:41:07 +0000
commit0f7f7b48825b7619e93a1e5ae7f345ce1b0e8ffa (patch)
treef259644e90bdcca6829e515c9c77e64b87e515c4
parent1b7bcb4d4dab38e8c690904f04067e9383e8d47c (diff)
parent3a1e082c0deefd241508496c3931a411915e27b5 (diff)
Merge "[Media ML] Add @JavaOnlyStableParcelable to media classes"
-rw-r--r--media/java/android/media/AudioAttributes.aidl2
-rw-r--r--media/java/android/media/MediaMetadata.aidl2
2 files changed, 2 insertions, 2 deletions
diff --git a/media/java/android/media/AudioAttributes.aidl b/media/java/android/media/AudioAttributes.aidl
index 04587f9d48d4..88a6f50d2d3c 100644
--- a/media/java/android/media/AudioAttributes.aidl
+++ b/media/java/android/media/AudioAttributes.aidl
@@ -15,4 +15,4 @@
package android.media;
-parcelable AudioAttributes;
+@JavaOnlyStableParcelable parcelable AudioAttributes;
diff --git a/media/java/android/media/MediaMetadata.aidl b/media/java/android/media/MediaMetadata.aidl
index 66ee48304168..1d78da2a1b8e 100644
--- a/media/java/android/media/MediaMetadata.aidl
+++ b/media/java/android/media/MediaMetadata.aidl
@@ -15,4 +15,4 @@
package android.media;
-parcelable MediaMetadata;
+@JavaOnlyStableParcelable parcelable MediaMetadata;