Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef86923d authored by Hyundo Moon's avatar Hyundo Moon Committed by Android (Google) Code Review
Browse files

Merge "Update the method to check custom parcelable"

parents d322dccf b12dbce5

apex/media/framework/java/android/media/MediaSession2.java

+3 −2
Original line number Diff line number Diff line
@@ -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;

media/java/android/media/session/MediaSession.java

+3 −2
Original line number Diff line number Diff line
@@ -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;