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

Commit 5191203e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "frameworks/base: Add dummy parameters for compatibility"

parents 17796c0c 311ddea5

media/java/android/media/CamcorderProfile.java

+6 −0
Original line number Diff line number Diff line
@@ -120,6 +120,12 @@ public class CamcorderProfile 


    public static final int QUALITY_4kDCI = 13;



    /**

    * {@hide}

    */



    public static final int QUALITY_2160P = 14;



    // Start and end of quality list

    private static final int QUALITY_LIST_START = QUALITY_LOW;

    private static final int QUALITY_LIST_END = QUALITY_4kDCI;

media/java/android/media/MediaRecorder.java

+2 −0
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ public class MediaRecorder 
        public static final int H263 = 1;

        public static final int H264 = 2;

        public static final int MPEG_4_SP = 3;

        /** @hide */

        public static final int H265 = 4;

    }



    /**