Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Annotate mainline code runs on only some versions" into sc-mainline-prod

Browse Source
This commit is contained in:
TreeHugger Robot
2021-12-22 15:03:55 +00:00
committed by Android (Google) Code Review
parent 52e69a4b94 586ac4b654
commit 45a790a4c6
4 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apex/media/framework/java/android/media/MediaCommunicationManager.java
View File

@@ -33,6 +33,8 @@ import android.os.UserHandle;
import android.service.media.MediaBrowserService;
import android.util.Log;
import androidx.annotation.RequiresApi;
import com.android.internal.annotations.GuardedBy;
import com.android.modules.annotation.MinSdk;
import com.android.modules.utils.build.SdkLevel;
@@ -48,6 +50,7 @@ import java.util.concurrent.Executor;
* that applications have published to express their ongoing media playback state.
*/
@MinSdk(Build.VERSION_CODES.S)
@RequiresApi(Build.VERSION_CODES.S)
@SystemService(Context.MEDIA_COMMUNICATION_SERVICE)
public class MediaCommunicationManager {
private static final String TAG = "MediaCommunicationManager";

3
apex/media/framework/java/android/media/MediaFrameworkInitializer.java
View File

@@ -23,6 +23,8 @@ import android.app.SystemServiceRegistry;
import android.content.Context;
import android.os.Build;
import androidx.annotation.RequiresApi;
import com.android.modules.annotation.MinSdk;
import com.android.modules.utils.build.SdkLevel;
@@ -32,6 +34,7 @@ import com.android.modules.utils.build.SdkLevel;
* @hide
*/
@MinSdk(Build.VERSION_CODES.S)
@RequiresApi(Build.VERSION_CODES.S)
@SystemApi(client = Client.MODULE_LIBRARIES)
public class MediaFrameworkInitializer {
private MediaFrameworkInitializer() {

1
apex/media/framework/java/android/media/MediaParser.java
View File

@@ -199,6 +199,7 @@ import java.util.function.Function;
*
* </pre>
*/
@RequiresApi(Build.VERSION_CODES.R)
public final class MediaParser {
/**

3
apex/media/framework/java/android/media/MediaTranscodingManager.java
View File

@@ -33,6 +33,8 @@ import android.os.ServiceSpecificException;
import android.system.Os;
import android.util.Log;
import androidx.annotation.RequiresApi;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.modules.annotation.MinSdk;
@@ -85,6 +87,7 @@ import java.util.concurrent.Executors;
@hide
*/
@MinSdk(Build.VERSION_CODES.S)
@RequiresApi(Build.VERSION_CODES.S)
@SystemApi
public final class MediaTranscodingManager {
private static final String TAG = "MediaTranscodingManager";