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

Commit c2a4ca2d authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add final to MediaRouter2" into rvc-dev am: ccd4db5e am: f3c3fcee am: b378c1a3 

Change-Id: I610b32756a2b26e5015b508da76bd348cd3fbd8c
parents 47bb5280 b378c1a3

api/current.txt

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

























media/java/android/media/MediaRoute2ProviderService.java



+0
−4




























Original line number
Diff line number
Diff line








@@ -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) {

































media/java/android/media/MediaRouter2.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -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")

































media/java/android/media/MediaRouter2Manager.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -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.