Merge Android 12L

Bug: 222710654
Merged-In: I9aca5de72f7205ce7243e19acad1234604b5a6f9
Change-Id: I3298829d1c53bdb7bd53f24a0acf617ac9aaba25

7 files changed, 0 insertions, 22 deletions

diff --git a/apex/framework/java/android/media/MediaCommunicationManager.java b/apex/framework/java/android/media/MediaCommunicationManager.java
index 40992f1..f39bcfb 100644
--- a/apex/framework/java/android/media/MediaCommunicationManager.java
+++ b/apex/framework/java/android/media/MediaCommunicationManager.java
@@ -33,8 +33,6 @@ 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;
@@ -50,7 +48,6 @@ 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/framework/java/android/media/MediaFrameworkInitializer.java b/apex/framework/java/android/media/MediaFrameworkInitializer.java
index d7ad97d..75a56b7 100644
--- a/apex/framework/java/android/media/MediaFrameworkInitializer.java
+++ b/apex/framework/java/android/media/MediaFrameworkInitializer.java
@@ -23,8 +23,6 @@ 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;
 
@@ -34,7 +32,6 @@ 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/framework/java/android/media/MediaParceledListSlice.java b/apex/framework/java/android/media/MediaParceledListSlice.java
index fb36e80..47ac193 100644
--- a/apex/framework/java/android/media/MediaParceledListSlice.java
+++ b/apex/framework/java/android/media/MediaParceledListSlice.java
@@ -18,12 +18,9 @@ package android.media;
 
 import android.annotation.NonNull;
 import android.annotation.SystemApi;
-import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import androidx.annotation.RequiresApi;
-
 import java.util.Collections;
 import java.util.List;
 
@@ -44,7 +41,6 @@ import java.util.List;
  * @hide
  */
 @Deprecated
-@RequiresApi(Build.VERSION_CODES.S)
 @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class MediaParceledListSlice<T extends Parcelable>
         extends BaseMediaParceledListSlice<T> {
diff --git a/apex/framework/java/android/media/MediaParser.java b/apex/framework/java/android/media/MediaParser.java
index b6f85c7..8cc3bc0 100644
--- a/apex/framework/java/android/media/MediaParser.java
+++ b/apex/framework/java/android/media/MediaParser.java
@@ -199,7 +199,6 @@ import java.util.function.Function;
  *
  * </pre>
  */
-@RequiresApi(Build.VERSION_CODES.R)
 public final class MediaParser {
 
     /**
diff --git a/apex/framework/java/android/media/MediaTranscodingManager.java b/apex/framework/java/android/media/MediaTranscodingManager.java
index ca35c01..1a84929 100644
--- a/apex/framework/java/android/media/MediaTranscodingManager.java
+++ b/apex/framework/java/android/media/MediaTranscodingManager.java
@@ -34,8 +34,6 @@ 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;
@@ -88,7 +86,6 @@ 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";
diff --git a/apex/service/Android.bp b/apex/service/Android.bp
index 60ff769..1911735 100644
--- a/apex/service/Android.bp
+++ b/apex/service/Android.bp
@@ -35,9 +35,7 @@ java_sdk_library {
         ":service-media-s-sources",
     ],
     libs: [
-        "androidx.annotation_annotation",
         "updatable-media",
-        "modules-annotation-minsdk",
     ],
     sdk_version: "system_server_current",
     min_sdk_version: "29", // TODO: We may need to bump this at some point.
diff --git a/apex/service/java/com/android/server/media/MediaCommunicationService.java b/apex/service/java/com/android/server/media/MediaCommunicationService.java
index 0dc3e79..ed31aa3 100644
--- a/apex/service/java/com/android/server/media/MediaCommunicationService.java
+++ b/apex/service/java/com/android/server/media/MediaCommunicationService.java
@@ -32,7 +32,6 @@ import android.media.MediaParceledListSlice;
 import android.media.Session2CommandGroup;
 import android.media.Session2Token;
 import android.os.Binder;
-import android.os.Build;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
@@ -44,10 +43,7 @@ import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseIntArray;
 
-import androidx.annotation.RequiresApi;
-
 import com.android.internal.annotations.GuardedBy;
-import com.android.modules.annotation.MinSdk;
 import com.android.server.SystemService;
 
 import java.lang.ref.WeakReference;
@@ -63,8 +59,6 @@ import java.util.stream.Collectors;
  * and their ongoing media playback state.
  * @hide
  */
-@MinSdk(Build.VERSION_CODES.S)
-@RequiresApi(Build.VERSION_CODES.S)
 public class MediaCommunicationService extends SystemService {
     private static final String TAG = "MediaCommunicationService";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);