From da6dab8db222c6c343bfe109ae4eb9f4b87e8eaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= Date: Thu, 3 Aug 2023 14:34:47 +0000 Subject: [PATCH] Make package-private fields private and fix field ordering This is a non-functional change. Bug: 192657812 Test: atest MediaRouter2Test SystemMediaRouter2Test Change-Id: Id6dddfc1486f6d049bce958bf8cc34dc451be482 --- media/java/android/media/MediaRouter2.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index 6b67d1452debf..9b186b5a15df8 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -105,27 +105,26 @@ public final class MediaRouter2 { *

Uses {@link MediaRoute2Info#getId()} to set each entry's key. */ @GuardedBy("mLock") - final Map mRoutes = new ArrayMap<>(); + private final Map mRoutes = new ArrayMap<>(); + + private final RoutingController mSystemController; @GuardedBy("mLock") - @Nullable - private RouteListingPreference mRouteListingPreference; + private final Map 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 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