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

Commit 268294f3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "MediaRouter2: Make TAGs have common prefix 'MR2'"

parents 5a5678d2 7d3ab337

media/java/android/media/MediaRoute2Info.java

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

media/java/android/media/MediaRoute2ProviderService.java

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

media/java/android/media/MediaRouter2.java

+3 −2
Original line number Diff line number Diff line
@@ -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<CallbackRecord> mCallbackRecords = new CopyOnWriteArrayList<>();

    private final CopyOnWriteArrayList<CallbackRecord> mCallbackRecords =

            new CopyOnWriteArrayList<>();

    @GuardedBy("sLock")

    private List<String> mControlCategories = Collections.emptyList();

    @GuardedBy("sLock")

media/java/android/media/MediaRouter2Manager.java

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

media/tests/MediaRouteProvider/src/com/android/mediarouteprovider/example/SampleMediaRoute2ProviderService.java

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