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

Commit 7015f429 authored by Ray Essick's avatar Ray Essick
Browse files

Annotate mainline code runs on only some versions 

Include appropriate annotations to indicate some code that
is included in mainline modules (back to Q) but is only ever
used in later modules (Android R or S).

Bug: 188851874
Test: build, re-lint
Change-Id: Iebee93f1bf1c316e2a45ffed8a8d833d8a6596a7
parent 2f8ddace

apex/media/framework/java/android/media/MediaCommunicationManager.java

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.service.media.MediaBrowserService; 
import android.util.Log;

import android.view.KeyEvent;



import androidx.annotation.RequiresApi;



import com.android.internal.annotations.GuardedBy;

import com.android.modules.annotation.MinSdk;

import com.android.modules.utils.build.SdkLevel;
@@ -49,6 +51,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";

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

+3 −0
Original line number Diff line number Diff line
@@ -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() {

apex/media/framework/java/android/media/MediaParser.java

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ import java.util.function.Function; 
 *

 * </pre>

 */

@RequiresApi(Build.VERSION_CODES.R)

public final class MediaParser {



    /**

apex/media/framework/java/android/media/MediaTranscodingManager.java

+3 −0
Original line number Diff line number Diff line
@@ -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";