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

Merge "Make package-private fields private and fix field ordering" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-03 16:47:06 +00:00
committed by Android (Google) Code Review
parent afd8944a0c da6dab8db2
commit 17d4ebf4e6
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,27 +105,26 @@ public final class MediaRouter2 {
* <p>Uses {@link MediaRoute2Info#getId()} to set each entry's key.
*/
@GuardedBy("mLock")
final Map<String, MediaRoute2Info> mRoutes = new ArrayMap<>();
private final Map<String, MediaRoute2Info> mRoutes = new ArrayMap<>();
private final RoutingController mSystemController;
@GuardedBy("mLock")
@Nullable
private RouteListingPreference mRouteListingPreference;
private final Map<String, RoutingController> mNonSystemRoutingControllers = new ArrayMap<>();
final RoutingController mSystemController;
private final AtomicInteger mNextRequestId = new AtomicInteger(1);
private final Handler mHandler;
@GuardedBy("mLock")
private RouteDiscoveryPreference mDiscoveryPreference = RouteDiscoveryPreference.EMPTY;
// TODO: Make MediaRouter2 is always connected to the MediaRouterService.
@GuardedBy("mLock")
MediaRouter2Stub mStub;
private MediaRouter2Stub mStub;
@GuardedBy("mLock")
private final Map<String, RoutingController> mNonSystemRoutingControllers = new ArrayMap<>();
private final AtomicInteger mNextRequestId = new AtomicInteger(1);
final Handler mHandler;
@Nullable
private RouteListingPreference mRouteListingPreference;
/**
* Stores an auxiliary copy of {@link #mFilteredRoutes} at the time of the last route callback