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

Commit 12dc4463 authored by Andy Hung's avatar Andy Hung
Browse files

Add MediaMetrics TestApi entries for hidden fields 

Test: CTS Audio(Record|Track)Test#testMediaMetrics
Bug: 127700128
Change-Id: I1413ef9e7f898bb6e1c662353f998bfa170e1413
parent 55f1a27a

api/test-current.txt

+18 −0
Original line number Diff line number Diff line
@@ -988,11 +988,29 @@ package android.media { 
    method public static boolean isEncodingLinearPcm(int);

  }



  public static final class AudioRecord.MetricsConstants {

    field public static final String ATTRIBUTES = "android.media.audiorecord.attributes";

    field public static final String CHANNEL_MASK = "android.media.audiorecord.channelMask";

    field public static final String DURATION_MS = "android.media.audiorecord.durationMs";

    field public static final String FRAME_COUNT = "android.media.audiorecord.frameCount";

    field public static final String PORT_ID = "android.media.audiorecord.portId";

    field public static final String START_COUNT = "android.media.audiorecord.startCount";

  }



  public final class AudioRecordingConfiguration implements android.os.Parcelable {

    ctor public AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String, int, boolean, int, android.media.audiofx.AudioEffect.Descriptor[], android.media.audiofx.AudioEffect.Descriptor[]);

    ctor public AudioRecordingConfiguration(int, int, int, android.media.AudioFormat, android.media.AudioFormat, int, String);

  }



  public static final class AudioTrack.MetricsConstants {

    field public static final String ATTRIBUTES = "android.media.audiotrack.attributes";

    field public static final String CHANNEL_MASK = "android.media.audiotrack.channelMask";

    field public static final String ENCODING = "android.media.audiotrack.encoding";

    field public static final String FRAME_COUNT = "android.media.audiotrack.frameCount";

    field public static final String PORT_ID = "android.media.audiotrack.portId";

    field public static final String SAMPLE_RATE = "android.media.audiotrack.sampleRate";

  }



  public final class BufferingParams implements android.os.Parcelable {

    method public int describeContents();

    method public int getInitialMarkMs();

media/java/android/media/AudioRecord.java

+56 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.IntDef; 
import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.app.ActivityThread;

import android.media.audiopolicy.AudioMix;
@@ -2024,5 +2025,60 @@ public class AudioRecord implements AudioRouting, MicrophoneDirection, 
         * The value is an {@code int}.

         */

        public static final String CHANNELS = MM_PREFIX + "channels";



        /**

         * Use for testing only. Do not expose.

         * The native channel mask.

         * The value is a {@code long}.

         * @hide

         */

        @TestApi

        public static final String CHANNEL_MASK = MM_PREFIX + "channelMask";





        /**

         * Use for testing only. Do not expose.

         * The port id of this input port in audioserver.

         * The value is an {@code int}.

         * @hide

         */

        @TestApi

        public static final String PORT_ID = MM_PREFIX + "portId";



        /**

         * Use for testing only. Do not expose.

         * The buffer frameCount.

         * The value is an {@code int}.

         * @hide

         */

        @TestApi

        public static final String FRAME_COUNT = MM_PREFIX + "frameCount";



        /**

         * Use for testing only. Do not expose.

         * The actual record track attributes used.

         * The value is a {@code String}.

         * @hide

         */

        @TestApi

        public static final String ATTRIBUTES = MM_PREFIX + "attributes";



        /**

         * Use for testing only. Do not expose.

         * The buffer frameCount

         * The value is a {@code double}.

         * @hide

         */

        @TestApi

        public static final String DURATION_MS = MM_PREFIX + "durationMs";



        /**

         * Use for testing only. Do not expose.

         * The number of times the record track has started

         * The value is a {@code long}.

         * @hide

         */

        @TestApi

        public static final String START_COUNT = MM_PREFIX + "startCount";

    }

}

media/java/android/media/AudioTrack.java

+55 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.annotation.IntDef; 
import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;

import android.annotation.UnsupportedAppUsage;

import android.os.Binder;

import android.os.Build;
@@ -3624,5 +3625,59 @@ public class AudioTrack extends PlayerBase 
         */

        @Deprecated

        public static final String CHANNELMASK = "android.media.audiorecord.channelmask";



        /**

         * Use for testing only. Do not expose.

         * The current sample rate.

         * The value is an {@code int}.

         * @hide

         */

        @TestApi

        public static final String SAMPLE_RATE = MM_PREFIX + "sampleRate";



        /**

         * Use for testing only. Do not expose.

         * The native channel mask.

         * The value is a {@code long}.

         * @hide

         */

        @TestApi

        public static final String CHANNEL_MASK = MM_PREFIX + "channelMask";



        /**

         * Use for testing only. Do not expose.

         * The output audio data encoding.

         * The value is a {@code String}.

         * @hide

         */

        @TestApi

        public static final String ENCODING = MM_PREFIX + "encoding";



        /**

         * Use for testing only. Do not expose.

         * The port id of this track port in audioserver.

         * The value is an {@code int}.

         * @hide

         */

        @TestApi

        public static final String PORT_ID = MM_PREFIX + "portId";



        /**

         * Use for testing only. Do not expose.

         * The buffer frameCount.

         * The value is an {@code int}.

         * @hide

         */

        @TestApi

        public static final String FRAME_COUNT = MM_PREFIX + "frameCount";



        /**

         * Use for testing only. Do not expose.

         * The actual track attributes used.

         * The value is a {@code String}.

         * @hide

         */

        @TestApi

        public static final String ATTRIBUTES = MM_PREFIX + "attributes";

    }

}