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

Commit f35c5bd0 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Annotate MediaCommunicationService for only >= S 2p: 698b4251

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16507439

Bug: 183737580
Change-Id: I87044b1a3191592da28c639900928d42158db4c8
parents d77c92a3 698b4251
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -40,7 +40,10 @@ java_sdk_library {
    ],
    ],
    libs: [
    libs: [
        "updatable-media",
        "updatable-media",
        "modules-annotation-minsdk",
        "modules-utils-build",
    ],
    ],
    jarjar_rules: "jarjar_rules.txt",
    sdk_version: "system_server_current",
    sdk_version: "system_server_current",
    min_sdk_version: "29", // TODO: We may need to bump this at some point.
    min_sdk_version: "29", // TODO: We may need to bump this at some point.
    apex_available: [
    apex_available: [
+1 −0
Original line number Original line Diff line number Diff line
rule com.android.modules.** android.media.internal.@1
+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ import android.media.Session2CommandGroup;
import android.media.Session2Token;
import android.media.Session2Token;
import android.media.session.MediaSessionManager;
import android.media.session.MediaSessionManager;
import android.os.Binder;
import android.os.Binder;
import android.os.Build;
import android.os.Handler;
import android.os.Handler;
import android.os.IBinder;
import android.os.IBinder;
import android.os.Looper;
import android.os.Looper;
@@ -46,6 +47,7 @@ import android.util.SparseIntArray;
import android.view.KeyEvent;
import android.view.KeyEvent;


import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.GuardedBy;
import com.android.modules.annotation.MinSdk;
import com.android.server.SystemService;
import com.android.server.SystemService;


import java.lang.ref.WeakReference;
import java.lang.ref.WeakReference;
@@ -60,6 +62,7 @@ import java.util.concurrent.Executors;
 * and their ongoing media playback state.
 * and their ongoing media playback state.
 * @hide
 * @hide
 */
 */
@MinSdk(Build.VERSION_CODES.S)
public class MediaCommunicationService extends SystemService {
public class MediaCommunicationService extends SystemService {
    private static final String TAG = "MediaCommunicationSrv";
    private static final String TAG = "MediaCommunicationSrv";
    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
    private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);