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

Commit 2a3ba7e3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes from topic "presubmit-am-9222e5f68a4c4986840a218e2ed2f9c5" 

* changes:
  [automerge] Annotate MediaCommunicationService for only >= S 2p: 698b4251
  Annotate MediaCommunicationService for only >= S
parents d25904a2 f35c5bd0

apex/media/service/Android.bp

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

apex/media/service/jarjar_rules.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
rule com.android.modules.** android.media.internal.@1

apex/media/service/java/com/android/server/media/MediaCommunicationService.java

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