diff --git a/media/java/android/media/MediaRoute2Info.java b/media/java/android/media/MediaRoute2Info.java index b9fdde38268fe..59bd96ffb1bd9 100644 --- a/media/java/android/media/MediaRoute2Info.java +++ b/media/java/android/media/MediaRoute2Info.java @@ -369,7 +369,7 @@ public final class MediaRoute2Info implements Parcelable { @NonNull public Builder setProviderId(@NonNull String providerId) { if (TextUtils.isEmpty(providerId)) { - throw new IllegalArgumentException("id must not be null or empty"); + throw new IllegalArgumentException("providerId must not be null or empty"); } mProviderId = providerId; return this; diff --git a/media/java/android/media/MediaRoute2ProviderService.java b/media/java/android/media/MediaRoute2ProviderService.java index 58deff23b66ae..5f5d200c6f5e9 100644 --- a/media/java/android/media/MediaRoute2ProviderService.java +++ b/media/java/android/media/MediaRoute2ProviderService.java @@ -30,7 +30,7 @@ import android.util.Log; * @hide */ public abstract class MediaRoute2ProviderService extends Service { - private static final String TAG = "MediaRouteProviderSrv"; + private static final String TAG = "MR2ProviderService"; public static final String SERVICE_INTERFACE = "android.media.MediaRoute2ProviderService"; diff --git a/media/java/android/media/MediaRouter2.java b/media/java/android/media/MediaRouter2.java index aca40d8ee8916..b52e2d647e5a7 100644 --- a/media/java/android/media/MediaRouter2.java +++ b/media/java/android/media/MediaRouter2.java @@ -44,7 +44,7 @@ import java.util.concurrent.Executor; * @hide */ public class MediaRouter2 { - private static final String TAG = "MediaRouter"; + private static final String TAG = "MR2"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private static final Object sLock = new Object(); @@ -54,7 +54,8 @@ public class MediaRouter2 { private Context mContext; private final IMediaRouterService mMediaRouterService; - private CopyOnWriteArrayList mCallbackRecords = new CopyOnWriteArrayList<>(); + private final CopyOnWriteArrayList mCallbackRecords = + new CopyOnWriteArrayList<>(); @GuardedBy("sLock") private List mControlCategories = Collections.emptyList(); @GuardedBy("sLock") diff --git a/media/java/android/media/MediaRouter2Manager.java b/media/java/android/media/MediaRouter2Manager.java index 4f2a295b07798..0d7b6ff0ea916 100644 --- a/media/java/android/media/MediaRouter2Manager.java +++ b/media/java/android/media/MediaRouter2Manager.java @@ -46,7 +46,7 @@ import java.util.concurrent.Executor; * @hide */ public class MediaRouter2Manager { - private static final String TAG = "MediaRouter2Manager"; + private static final String TAG = "MR2Manager"; private static final Object sLock = new Object(); @GuardedBy("sLock") diff --git a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java index 680c87930676f..f4f8d0b736581 100644 --- a/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java +++ b/media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; public class SampleMediaRoute2ProviderService extends MediaRoute2ProviderService { - private static final String TAG = "SampleMediaRoute2Serv"; + private static final String TAG = "SampleMR2ProviderSvc"; public static final String ROUTE_ID1 = "route_id1"; public static final String ROUTE_NAME1 = "Sample Route 1"; diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java index 9eac252f39663..4816ceb5d76c2 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderProxy.java @@ -43,7 +43,7 @@ import java.util.Objects; * Maintains a connection to a particular media route provider service. */ final class MediaRoute2ProviderProxy implements ServiceConnection { - private static final String TAG = "MediaRoute2Provider"; + private static final String TAG = "MR2ProviderProxy"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private final Context mContext; @@ -274,7 +274,9 @@ final class MediaRoute2ProviderProxy implements ServiceConnection { .setUniqueId(mUniqueId) .build(); } - mHandler.post(mStateChanged); + if (mCallback != null) { + mCallback.onProviderStateChanged(MediaRoute2ProviderProxy.this); + } } private void disconnect() { @@ -291,15 +293,6 @@ final class MediaRoute2ProviderProxy implements ServiceConnection { return "Service connection " + mComponentName.flattenToShortString(); } - private final Runnable mStateChanged = new Runnable() { - @Override - public void run() { - if (mCallback != null) { - mCallback.onProviderStateChanged(MediaRoute2ProviderProxy.this); - } - } - }; - public interface Callback { void onProviderStateChanged(MediaRoute2ProviderProxy provider); } diff --git a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java index 194015d306de9..c95119da6d25a 100644 --- a/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java +++ b/services/core/java/com/android/server/media/MediaRoute2ProviderWatcher.java @@ -35,9 +35,10 @@ import java.util.ArrayList; import java.util.Collections; /** + * Watches changes of packages, or scan them for finding media route providers. */ final class MediaRoute2ProviderWatcher { - private static final String TAG = "MediaRouteProvider"; // max. 23 chars + private static final String TAG = "MR2ProviderWatcher"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private final Context mContext; diff --git a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java index 74d59ac7b62aa..361dc36736650 100644 --- a/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java +++ b/services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java @@ -55,7 +55,7 @@ import java.util.Objects; * TODO: Merge this to MediaRouterService once it's finished. */ class MediaRouter2ServiceImpl { - private static final String TAG = "MediaRouter2ServiceImpl"; + private static final String TAG = "MR2ServiceImpl"; private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); private final Context mContext; @@ -339,11 +339,11 @@ class MediaRouter2ServiceImpl { int uid, int pid, String packageName, int userId, boolean trusted) { final IBinder binder = client.asBinder(); if (mAllClientRecords.get(binder) == null) { - boolean newUser = false; UserRecord userRecord = mUserRecords.get(userId); if (userRecord == null) { userRecord = new UserRecord(userId); - newUser = true; + mUserRecords.put(userId, userRecord); + initializeUserLocked(userRecord); } Client2Record clientRecord = new Client2Record(userRecord, client, uid, pid, packageName, trusted); @@ -353,11 +353,6 @@ class MediaRouter2ServiceImpl { throw new RuntimeException("Media router client died prematurely.", ex); } - if (newUser) { - mUserRecords.put(userId, userRecord); - initializeUserLocked(userRecord); - } - userRecord.mClientRecords.add(clientRecord); mAllClientRecords.put(binder, clientRecord); @@ -815,8 +810,6 @@ class MediaRouter2ServiceImpl { if (service == null) { return; } - final List managers = new ArrayList<>(); - final List clients = new ArrayList<>(); final List providers = new ArrayList<>(); for (MediaRoute2ProviderProxy mediaProvider : mMediaProviders) { final MediaRoute2ProviderInfo providerInfo = @@ -829,6 +822,8 @@ class MediaRouter2ServiceImpl { } mProviderInfos = providers; + final List managers = new ArrayList<>(); + final List clients = new ArrayList<>(); synchronized (service.mLock) { for (ManagerRecord managerRecord : mUserRecord.mManagerRecords) { managers.add(managerRecord.mManager); @@ -878,9 +873,8 @@ class MediaRouter2ServiceImpl { } List managers = new ArrayList<>(); synchronized (service.mLock) { - final int count = mUserRecord.mManagerRecords.size(); - for (int i = 0; i < count; i++) { - managers.add(mUserRecord.mManagerRecords.get(i).mManager); + for (ManagerRecord managerRecord : mUserRecord.mManagerRecords) { + managers.add(managerRecord.mManager); } } for (IMediaRouter2Manager manager : managers) {