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

Commit 70978f00 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use different component name for SystemMR2Provider2" into main

parents 727fc487 4a8492c8

services/core/java/com/android/server/media/SystemMediaRoute2Provider.java

+8 −2
Original line number Diff line number Diff line
@@ -90,7 +90,12 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
    private volatile SessionCreationOrTransferRequest mPendingTransferRequest;



    SystemMediaRoute2Provider(Context context, UserHandle user, Looper looper) {

        super(COMPONENT_NAME, /* isSystemRouteProvider= */ true);

        this(context, COMPONENT_NAME, user, looper);

    }



    protected SystemMediaRoute2Provider(

            Context context, ComponentName componentName, UserHandle user, Looper looper) {

        super(componentName, /* isSystemRouteProvider= */ true);

        mContext = context;

        mUser = user;

        mHandler = new Handler(looper);
@@ -588,7 +593,8 @@ class SystemMediaRoute2Provider extends MediaRoute2Provider { 
    @Override

    protected String getDebugString() {

        return TextUtils.formatSimple(

                "SystemMR2Provider - package: %s, selected route id: %s, bluetooth impl: %s",

                "%s - package: %s, selected route id: %s, bluetooth impl: %s",

                getClass().getSimpleName(),

                mComponentName.getPackageName(),

                mSelectedRouteId,

                mBluetoothRouteController.getClass().getSimpleName());

services/core/java/com/android/server/media/SystemMediaRoute2Provider2.java

+8 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.media;



import android.content.ComponentName;

import android.content.Context;

import android.media.MediaRoute2ProviderService;

import android.os.Looper;
@@ -28,7 +29,13 @@ import android.os.UserHandle; 
 * <p>System routes are those which can handle the system audio and/or video.

 */

/* package */ class SystemMediaRoute2Provider2 extends SystemMediaRoute2Provider {



    private static final ComponentName COMPONENT_NAME =

            new ComponentName(

                    SystemMediaRoute2Provider2.class.getPackage().getName(),

                    SystemMediaRoute2Provider2.class.getName());



    SystemMediaRoute2Provider2(Context context, UserHandle user, Looper looper) {

        super(context, user, looper);

        super(context, COMPONENT_NAME, user, looper);

    }

}