From 87e73461789927d1004ae91bc8c8392fc002e4fb Mon Sep 17 00:00:00 2001 From: Hyundo Moon Date: Mon, 8 Feb 2021 15:31:56 +0900 Subject: Add MediaCommunicationManager#getVersion() Bug: 179634039 Test: Passed test Change-Id: I9413936558d809f7076c1d6ec11b2d4165089ad3 --- apex/media/framework/api/current.txt | 1 + .../android/media/MediaCommunicationManager.java | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/apex/media/framework/api/current.txt b/apex/media/framework/api/current.txt index 8b9990f9e833..67fa9bb55202 100644 --- a/apex/media/framework/api/current.txt +++ b/apex/media/framework/api/current.txt @@ -29,6 +29,7 @@ package android.media { } public class MediaCommunicationManager { + method @IntRange(from=1) public int getVersion(); } public class MediaController2 implements java.lang.AutoCloseable { diff --git a/apex/media/framework/java/android/media/MediaCommunicationManager.java b/apex/media/framework/java/android/media/MediaCommunicationManager.java index b8065ef8c597..e686076c871c 100644 --- a/apex/media/framework/java/android/media/MediaCommunicationManager.java +++ b/apex/media/framework/java/android/media/MediaCommunicationManager.java @@ -15,6 +15,7 @@ */ package android.media; +import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.SystemService; import android.content.Context; @@ -30,6 +31,16 @@ import com.android.modules.utils.build.SdkLevel; public class 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 IMediaCommunicationService mService; @@ -43,7 +54,14 @@ public class MediaCommunicationManager { mContext = context; mService = IMediaCommunicationService.Stub.asInterface( MediaFrameworkInitializer.getMediaServiceManager() - .getMediaCommunicationServiceRegisterer() - .get()); + .getMediaCommunicationServiceRegisterer() + .get()); + } + + /** + * Gets the version of this {@link MediaCommunicationManager}. + */ + public @IntRange(from = 1) int getVersion() { + return CURRENT_VERSION; } } -- cgit v1.2.3-59-g8ed1b