From 3a1e082c0deefd241508496c3931a411915e27b5 Mon Sep 17 00:00:00 2001 From: Kyunglyul Hyun Date: Mon, 21 Sep 2020 23:17:17 +0900 Subject: [PATCH] [Media ML] Add @JavaOnlyStableParcelable to media classes For mainline module to receive parcelable classes not part of the module (i.e. framework class) as argument, they should be either structured parcelable or public/system api. For the latter case, we need to mark them as @JavaOnlyStableParcelable to ensure that they can be referenced safely. This CL adds the annotation to AudioAttributes and MediaMetadata, which are used by ISession, ISessionController, and ISessionControllerCallback. Bug: 169046322 Test: build successful Change-Id: Id2abb9f6b31e5432a631cc11aa65eb7c356451eb --- media/java/android/media/AudioAttributes.aidl | 2 +- media/java/android/media/MediaMetadata.aidl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/java/android/media/AudioAttributes.aidl b/media/java/android/media/AudioAttributes.aidl index 04587f9d48d4c..88a6f50d2d3ce 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 66ee48304168a..1d78da2a1b8e8 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;