diff options
| author | 2021-12-20 00:58:05 +0000 | |
|---|---|---|
| committer | 2021-12-20 00:58:05 +0000 | |
| commit | f35c5bd0964ca5035e55bb1e6ac57bf7eb38414d (patch) | |
| tree | 8916db5263bfdd0059a1d6952219a99862ef438b | |
| parent | d77c92a3f18ee96ed1340f3a8ae8207490d40e5e (diff) | |
| parent | 698b425133c71d19bed5ff7203fca3880a678182 (diff) | |
[automerge] Annotate MediaCommunicationService for only >= S 2p: 698b425133
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16507439
Bug: 183737580
Change-Id: I87044b1a3191592da28c639900928d42158db4c8
| -rw-r--r-- | apex/media/service/Android.bp | 3 | ||||
| -rw-r--r-- | apex/media/service/jarjar_rules.txt | 1 | ||||
| -rw-r--r-- | apex/media/service/java/com/android/server/media/MediaCommunicationService.java | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/apex/media/service/Android.bp b/apex/media/service/Android.bp index 271fc5312f8f..cf384acccb12 100644 --- a/apex/media/service/Android.bp +++ b/apex/media/service/Android.bp @@ -40,7 +40,10 @@ java_sdk_library { ], libs: [ "updatable-media", + "modules-annotation-minsdk", + "modules-utils-build", ], + jarjar_rules: "jarjar_rules.txt", sdk_version: "system_server_current", min_sdk_version: "29", // TODO: We may need to bump this at some point. apex_available: [ diff --git a/apex/media/service/jarjar_rules.txt b/apex/media/service/jarjar_rules.txt new file mode 100644 index 000000000000..7e37c2be5b4e --- /dev/null +++ b/apex/media/service/jarjar_rules.txt @@ -0,0 +1 @@ +rule com.android.modules.** android.media.internal.@1 diff --git a/apex/media/service/java/com/android/server/media/MediaCommunicationService.java b/apex/media/service/java/com/android/server/media/MediaCommunicationService.java index 74abf31cc84c..e48f234c5569 100644 --- a/apex/media/service/java/com/android/server/media/MediaCommunicationService.java +++ b/apex/media/service/java/com/android/server/media/MediaCommunicationService.java @@ -33,6 +33,7 @@ import android.media.Session2CommandGroup; import android.media.Session2Token; import android.media.session.MediaSessionManager; import android.os.Binder; +import android.os.Build; import android.os.Handler; import android.os.IBinder; import android.os.Looper; @@ -46,6 +47,7 @@ import android.util.SparseIntArray; import android.view.KeyEvent; import com.android.internal.annotations.GuardedBy; +import com.android.modules.annotation.MinSdk; import com.android.server.SystemService; import java.lang.ref.WeakReference; @@ -60,6 +62,7 @@ import java.util.concurrent.Executors; * and their ongoing media playback state. * @hide */ +@MinSdk(Build.VERSION_CODES.S) public class MediaCommunicationService extends SystemService { private static final String TAG = "MediaCommunicationSrv"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); |