Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e16 am: c27bc21c71 am: 674b32f0c5

Browse Source 
Change-Id: Ic7133989778ea46d02310233135a36ddd1119d58
This commit is contained in:
Automerger Merge Worker
2020-03-16 04:31:43 +00:00
parent 6324c67c6e 674b32f0c5
commit 460baaf1f5
4 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -27051,7 +27051,7 @@ package android.media {
method public abstract void onVolumeUpdateRequest(android.media.MediaRouter.RouteInfo, int);
}
public class MediaRouter2 {
public final class MediaRouter2 {
method @NonNull public java.util.List<android.media.MediaRouter2.RoutingController> getControllers();
method @NonNull public static android.media.MediaRouter2 getInstance(@NonNull android.content.Context);
method @NonNull public java.util.List<android.media.MediaRoute2Info> getRoutes();

4
media/java/android/media/MediaRoute2ProviderService.java
View File

@@ -466,10 +466,6 @@ public abstract class MediaRoute2ProviderService extends Service {
return;
}
List<RoutingSessionInfo> sessionInfos;
synchronized (mSessionLock) {
sessionInfos = new ArrayList<>(mSessionInfo.values());
}
try {
mRemoteCallback.updateState(mProviderInfo);
} catch (RemoteException ex) {

6
media/java/android/media/MediaRouter2.java
View File

@@ -58,7 +58,7 @@ import java.util.stream.Collectors;
// TODO: Add method names at the beginning of log messages. (e.g. updateControllerOnHandler)
// Not only MediaRouter2, but also to service / manager / provider.
// TODO: ensure thread-safe and document it
public class MediaRouter2 {
public final class MediaRouter2 {
private static final String TAG = "MR2";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private static final Object sRouterLock = new Object();
@@ -93,9 +93,9 @@ public class MediaRouter2 {
MediaRouter2Stub mStub;
@GuardedBy("sRouterLock")
private Map<String, RoutingController> mRoutingControllers = new ArrayMap<>();
private final Map<String, RoutingController> mRoutingControllers = new ArrayMap<>();
private AtomicInteger mControllerCreationRequestCnt = new AtomicInteger(1);
private final AtomicInteger mControllerCreationRequestCnt = new AtomicInteger(1);
final Handler mHandler;
@GuardedBy("sRouterLock")

6
media/java/android/media/MediaRouter2Manager.java
View File

@@ -50,7 +50,7 @@ import java.util.stream.Collectors;
* A class that monitors and controls media routing of other apps.
* @hide
*/
public class MediaRouter2Manager {
public final class MediaRouter2Manager {
private static final String TAG = "MR2Manager";
private static final Object sLock = new Object();
@@ -61,7 +61,7 @@ public class MediaRouter2Manager {
final String mPackageName;
private Context mContext;
private final Context mContext;
@GuardedBy("sLock")
private Client mClient;
private final IMediaRouterService mMediaRouterService;
@@ -74,7 +74,7 @@ public class MediaRouter2Manager {
@NonNull
final ConcurrentMap<String, List<String>> mPreferredFeaturesMap = new ConcurrentHashMap<>();
private AtomicInteger mNextRequestId = new AtomicInteger(1);
private final AtomicInteger mNextRequestId = new AtomicInteger(1);
/**
* Gets an instance of media router manager that controls media route of other applications.