From b12dbce52c5fa772734ce19c90c6880ad1d62227 Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Tue, 12 Oct 2021 11:14:52 +0900 Subject: [PATCH] Update the method to check custom parcelable Bug: 198449110 Test: Passed MediaSession(2)Test and MediaController2Test Change-Id: I0b3c514fa04e5d2a9616f360573c15fc5d6d53a0 --- apex/media/framework/java/android/media/MediaSession2.java | 5 +++-- media/java/android/media/session/MediaSession.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/apex/media/framework/java/android/media/MediaSession2.java b/apex/media/framework/java/android/media/MediaSession2.java index cb6e1a0b202a6..7d07eb35832e4 100644 --- a/apex/media/framework/java/android/media/MediaSession2.java +++ b/apex/media/framework/java/android/media/MediaSession2.java @@ -302,8 +302,9 @@ public class MediaSession2 implements AutoCloseable { parcel.setDataPosition(0); Bundle out = parcel.readBundle(null); - // Calling Bundle#size() will trigger Bundle#unparcel(). - out.size(); + for (String key : out.keySet()) { + out.get(key); + } } catch (BadParcelableException e) { Log.d(TAG, "Custom parcelable in bundle.", e); return true; diff --git a/media/java/android/media/session/MediaSession.java b/media/java/android/media/session/MediaSession.java index 20fa53d3ec328..bc00c404b11e4 100644 --- a/media/java/android/media/session/MediaSession.java +++ b/media/java/android/media/session/MediaSession.java @@ -657,8 +657,9 @@ public final class MediaSession { parcel.setDataPosition(0); Bundle out = parcel.readBundle(null); - // Calling Bundle#size() will trigger Bundle#unparcel(). - out.size(); + for (String key : out.keySet()) { + out.get(key); + } } catch (BadParcelableException e) { Log.d(TAG, "Custom parcelable in bundle.", e); return true;