From 586ac4b6549e4b006b4adcdd90ca83595baed762 Mon Sep 17 00:00:00 2001
From: Ray Essick <essick@google.com>
Date: Mon, 1 Nov 2021 13:43:26 -0700
Subject: [PATCH] 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
(cherry picked from commit 7015f42956cf9c1a1227ecc40bd2f825ba1be317)
---
 .../java/android/media/MediaCommunicationManager.java          | 3 +++
 .../java/android/media/MediaFrameworkInitializer.java          | 3 +++
 apex/media/framework/java/android/media/MediaParser.java       | 1 +
 .../framework/java/android/media/MediaTranscodingManager.java  | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/apex/media/framework/java/android/media/MediaCommunicationManager.java b/apex/media/framework/java/android/media/MediaCommunicationManager.java
index f39bcfb267bf5..40992f1ce09c3 100644
--- a/apex/media/framework/java/android/media/MediaCommunicationManager.java
+++ b/apex/media/framework/java/android/media/MediaCommunicationManager.java
@@ -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";
diff --git a/apex/media/framework/java/android/media/MediaFrameworkInitializer.java b/apex/media/framework/java/android/media/MediaFrameworkInitializer.java
index 75a56b7231d9a..d7ad97d55daf9 100644
--- a/apex/media/framework/java/android/media/MediaFrameworkInitializer.java
+++ b/apex/media/framework/java/android/media/MediaFrameworkInitializer.java
@@ -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() {
diff --git a/apex/media/framework/java/android/media/MediaParser.java b/apex/media/framework/java/android/media/MediaParser.java
index 8cc3bc08dfb5f..b6f85c7eac6f3 100644
--- a/apex/media/framework/java/android/media/MediaParser.java
+++ b/apex/media/framework/java/android/media/MediaParser.java
@@ -199,6 +199,7 @@ import java.util.function.Function;
  *
  * </pre>
  */
+@RequiresApi(Build.VERSION_CODES.R)
 public final class MediaParser {
 
     /**
diff --git a/apex/media/framework/java/android/media/MediaTranscodingManager.java b/apex/media/framework/java/android/media/MediaTranscodingManager.java
index 6eb93469f9751..aff3204010615 100644
--- a/apex/media/framework/java/android/media/MediaTranscodingManager.java
+++ b/apex/media/framework/java/android/media/MediaTranscodingManager.java
@@ -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";