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

Commit 9433181e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add MediaCommunicationManager#getVersion()" into sc-dev am: eff708b4 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia93a458dcb328fbc0e902f4aace770003e3971c6
parents c2c7c4a1 eff708b4

apex/media/framework/api/current.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ package android.media { 
  }

  }





  public class MediaCommunicationManager {

  public class MediaCommunicationManager {

    method @IntRange(from=1) public int getVersion();

  }

  }





  public class MediaController2 implements java.lang.AutoCloseable {

  public class MediaController2 implements java.lang.AutoCloseable {

apex/media/framework/java/android/media/MediaCommunicationManager.java

+20 −2
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

 */

package android.media;

package android.media;





import android.annotation.IntRange;

import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.SystemService;

import android.annotation.SystemService;

import android.content.Context;

import android.content.Context;
@@ -30,6 +31,16 @@ import com.android.modules.utils.build.SdkLevel; 
public class MediaCommunicationManager {

public class MediaCommunicationManager {

    private static final String TAG = "MediaCommunicationManager";

    private static final String TAG = "MediaCommunicationManager";





    /**

     * The manager version used from beginning.

     */

    private static final int VERSION_1 = 1;



    /**

     * Current manager version.

     */

    private static final int CURRENT_VERSION = VERSION_1;



    private final Context mContext;

    private final Context mContext;

    private final IMediaCommunicationService mService;

    private final IMediaCommunicationService mService;
@@ -46,4 +57,11 @@ public class MediaCommunicationManager { 
                        .getMediaCommunicationServiceRegisterer()

                        .getMediaCommunicationServiceRegisterer()

                        .get());

                        .get());

    }

    }



    /**

     * Gets the version of this {@link MediaCommunicationManager}.

     */

    public @IntRange(from = 1) int getVersion() {

        return CURRENT_VERSION;

    }

}
 
}