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

Commit 1d6cd173 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "transcoding: add @MinSdk to MediaTranscodeManager APIs" into sc-dev am: 68e6bdd7 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13877225

Change-Id: I3067f5ea85651ce7cace4daa1ec8c588851cb639
parents ca83a254 68e6bdd7

apex/media/framework/java/android/media/ApplicationMediaCapabilities.java

+4 −0
Original line number Diff line number Diff line
@@ -19,11 +19,14 @@ package android.media; 
import android.annotation.NonNull;

import android.content.ContentResolver;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.Parcel;

import android.os.Parcelable;

import android.util.Log;



import com.android.modules.annotation.MinSdk;



import org.xmlpull.v1.XmlPullParser;

import org.xmlpull.v1.XmlPullParserException;
@@ -77,6 +80,7 @@ import java.util.Set; 
 There are four types of HDR video(Dolby-Vision, HDR10, HDR10+, HLG) supported by the platform,

 application will only need to specify individual types they supported.

 */

@MinSdk(Build.VERSION_CODES.S)

public final class ApplicationMediaCapabilities implements Parcelable {

    private static final String TAG = "ApplicationMediaCapabilities";

apex/media/framework/java/android/media/MediaFeature.java

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ 
package android.media;



import android.annotation.StringDef;

import android.os.Build;



import com.android.modules.annotation.MinSdk;



import java.lang.annotation.Retention;

import java.lang.annotation.RetentionPolicy;
@@ -24,6 +27,7 @@ import java.lang.annotation.RetentionPolicy; 
/**

 * MediaFeature defines various media features, e.g. hdr type.

 */

@MinSdk(Build.VERSION_CODES.S)

public final class MediaFeature {

     /**

     * Defines tye type of HDR(high dynamic range) video.

apex/media/framework/java/android/media/MediaFrameworkInitializer.java

+3 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import android.annotation.SystemApi; 
import android.annotation.SystemApi.Client;

import android.app.SystemServiceRegistry;

import android.content.Context;

import android.os.Build;



import com.android.modules.annotation.MinSdk;

import com.android.modules.utils.build.SdkLevel;



/**
@@ -29,6 +31,7 @@ import com.android.modules.utils.build.SdkLevel; 
 *

 * @hide

 */

@MinSdk(Build.VERSION_CODES.S)

@SystemApi(client = Client.MODULE_LIBRARIES)

public class MediaFrameworkInitializer {

    private MediaFrameworkInitializer() {

apex/media/framework/java/android/media/MediaTranscodeManager.java

+3 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.res.AssetFileDescriptor;

import android.net.Uri;

import android.os.Build;

import android.os.ParcelFileDescriptor;

import android.os.RemoteException;

import android.os.ServiceSpecificException;
@@ -34,6 +35,7 @@ import android.util.Log; 


import com.android.internal.annotations.GuardedBy;

import com.android.internal.annotations.VisibleForTesting;

import com.android.modules.annotation.MinSdk;



import java.io.FileNotFoundException;

import java.lang.annotation.Retention;
@@ -99,6 +101,7 @@ import java.util.concurrent.Executors; 
 TODO(hkuang): Clarify whether supports framerate conversion.

 @hide

 */

@MinSdk(Build.VERSION_CODES.S)

@SystemApi

public final class MediaTranscodeManager {

    private static final String TAG = "MediaTranscodeManager";