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

Commit 2caa0a60 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android (Google) Code Review
Browse files

Merge "AudioAttributes: unhide CREATOR" into lmp-dev

parents 5341f94a 8aacb2e9

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -14050,6 +14050,7 @@ package android.media { 
    field public static final int CONTENT_TYPE_SONIFICATION = 4; // 0x4

    field public static final int CONTENT_TYPE_SPEECH = 1; // 0x1

    field public static final int CONTENT_TYPE_UNKNOWN = 0; // 0x0

    field public static final android.os.Parcelable.Creator CREATOR;

    field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1

    field public static final int USAGE_ALARM = 4; // 0x4

    field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb

media/java/android/media/AudioAttributes.java

+0 −1
Original line number Diff line number Diff line
@@ -530,7 +530,6 @@ public final class AudioAttributes implements Parcelable { 
        }

    }



    /** @hide */

    public static final Parcelable.Creator<AudioAttributes> CREATOR

            = new Parcelable.Creator<AudioAttributes>() {

        /**