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

Commit da6dab8d authored by Iván Budnik's avatar Iván Budnik
Browse files

Make package-private fields private and fix field ordering 

This is a non-functional change.

Bug: 192657812
Test: atest MediaRouter2Test SystemMediaRouter2Test
Change-Id: Id6dddfc1486f6d049bce958bf8cc34dc451be482
parent af228ddc

media/java/android/media/MediaRouter2.java

+9 −10
Original line number Diff line number Diff line
@@ -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