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

Commit a3056256 authored by Alexandre Francois's avatar Alexandre Francois Committed by Bishoy Gendy
Browse files

Use Slog in MR2ServiceImpl for adding logs in system logs 

For testing, get system logs live with logcat, for example:
adb logcat MR2ServiceImpl:I *:S
or generate a bug report, for example:
adb bugreport
then browse the file with the Android Bug Tool UI at
go/abt-web

Bug: 259705163
Test: manually
Change-Id: If0c8bdef7afcb445f6c9b5ced60ec97d0c5bb0d7
(cherry picked from commit 6dcefe69)
Merged-In: If0c8bdef7afcb445f6c9b5ced60ec97d0c5bb0d7
parent 99dc404b

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

+116 −0
Original line number Diff line number Diff line
@@ -608,6 +608,9 @@ class MediaRouter2ServiceImpl { 
    /* package */ void updateRunningUserAndProfiles(int newActiveUserId) {

        synchronized (mLock) {

            if (mCurrentActiveUserId != newActiveUserId) {

                Slog.i(TAG, TextUtils.formatSimple(

                        "switchUser | user: %d", newActiveUserId));



                mCurrentActiveUserId = newActiveUserId;

                for (int i = 0; i < mUserRecords.size(); i++) {

                    int userId = mUserRecords.keyAt(i);
@@ -679,6 +682,10 @@ class MediaRouter2ServiceImpl { 
        userRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::notifyRouterRegistered,

                        userRecord.mHandler, routerRecord));



        Slog.i(TAG, TextUtils.formatSimple(

                "registerRouter2 | package: %s, uid: %d, pid: %d, router: %d",

                packageName, uid, pid, routerRecord.mRouterId));

    }



    @GuardedBy("mLock")
@@ -689,6 +696,11 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "unregisterRouter2 | package: %s, router: %d",

                routerRecord.mPackageName,

                routerRecord.mRouterId));



        UserRecord userRecord = routerRecord.mUserRecord;

        userRecord.mRouterRecords.remove(routerRecord);

        routerRecord.mUserRecord.mHandler.sendMessage(
@@ -707,6 +719,11 @@ class MediaRouter2ServiceImpl { 
        if (routerRecord.mDiscoveryPreference.equals(discoveryRequest)) {

            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "setDiscoveryRequestWithRouter2 | router: %d, discovery request: %s",

                routerRecord.mRouterId, discoveryRequest.toString()));



        routerRecord.mDiscoveryPreference = discoveryRequest;

        routerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::notifyDiscoveryPreferenceChangedToManagers,
@@ -724,6 +741,10 @@ class MediaRouter2ServiceImpl { 
        RouterRecord routerRecord = mAllRouterRecords.get(binder);



        if (routerRecord != null) {

            Slog.i(TAG, TextUtils.formatSimple(

                    "setRouteVolumeWithRouter2 | router: %d, volume: %d",

                    routerRecord.mRouterId, volume));



            routerRecord.mUserRecord.mHandler.sendMessage(

                    obtainMessage(UserHandler::setRouteVolumeOnHandler,

                            routerRecord.mUserRecord.mHandler,
@@ -804,6 +825,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "selectRouteWithRouter2 | router: %d, route: %s",

                routerRecord.mRouterId, route.getId()));



        routerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::selectRouteOnHandler,

                        routerRecord.mUserRecord.mHandler,
@@ -819,6 +844,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "deselectRouteWithRouter2 | router: %d, route: %s",

                routerRecord.mRouterId, route.getId()));



        routerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::deselectRouteOnHandler,

                        routerRecord.mUserRecord.mHandler,
@@ -834,6 +863,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "transferToRouteWithRouter2 | router: %d, route: %s",

                routerRecord.mRouterId, route.getId()));



        String defaultRouteId =

                routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId();

        if (route.isSystemRoute() && !routerRecord.mHasModifyAudioRoutingPermission
@@ -859,6 +892,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "setSessionVolumeWithRouter2 | router: %d, session: %s, volume: %d",

                routerRecord.mRouterId,  uniqueSessionId, volume));



        routerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::setSessionVolumeOnHandler,

                        routerRecord.mUserRecord.mHandler,
@@ -874,6 +911,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "releaseSessionWithRouter2 | router: %d, session: %s",

                routerRecord.mRouterId,  uniqueSessionId));



        routerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::releaseSessionOnHandler,

                        routerRecord.mUserRecord.mHandler,
@@ -916,6 +957,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "registerManager | uid: %d, pid: %d, package: %s, user: %d",

                uid, pid, packageName, userId));



        mContext.enforcePermission(Manifest.permission.MEDIA_CONTENT_CONTROL, pid, uid,

                "Must hold MEDIA_CONTENT_CONTROL permission.");
@@ -951,6 +996,13 @@ class MediaRouter2ServiceImpl { 
            return;

        }

        UserRecord userRecord = managerRecord.mUserRecord;



        Slog.i(TAG, TextUtils.formatSimple(

                "unregisterManager | package: %s, user: %d, manager: %d",

                managerRecord.mPackageName,

                userRecord.mUserId,

                managerRecord.mManagerId));



        userRecord.mManagerRecords.remove(managerRecord);

        managerRecord.dispose();

        disposeUserIfNeededLocked(userRecord); // since manager removed from user
@@ -962,6 +1014,10 @@ class MediaRouter2ServiceImpl { 
        if (managerRecord == null) {

            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "startScan | manager: %d", managerRecord.mManagerId));



        managerRecord.startScan();

    }
@@ -971,6 +1027,10 @@ class MediaRouter2ServiceImpl { 
        if (managerRecord == null) {

            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "stopScan | manager: %d", managerRecord.mManagerId));



        managerRecord.stopScan();

    }
@@ -984,6 +1044,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "setRouteVolumeWithManager | manager: %d, route: %s, volume: %d",

                managerRecord.mManagerId, route.getId(), volume));



        long uniqueRequestId = toUniqueRequestId(managerRecord.mManagerId, requestId);

        managerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::setRouteVolumeOnHandler,
@@ -999,6 +1063,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "requestCreateSessionWithManager | manager: %d, route: %s",

                managerRecord.mManagerId, route.getId()));



        String packageName = oldSession.getClientPackageName();



        RouterRecord routerRecord = managerRecord.mUserRecord.findRouterRecordLocked(packageName);
@@ -1044,6 +1112,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "selectRouteWithManager | manager: %d, session: %s, route: %s",

                managerRecord.mManagerId, uniqueSessionId, route.getId()));



        // Can be null if the session is system's or RCN.

        RouterRecord routerRecord = managerRecord.mUserRecord.mHandler

                .findRouterWithSessionLocked(uniqueSessionId);
@@ -1065,6 +1137,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "deselectRouteWithManager | manager: %d, session: %s, route: %s",

                managerRecord.mManagerId, uniqueSessionId, route.getId()));



        // Can be null if the session is system's or RCN.

        RouterRecord routerRecord = managerRecord.mUserRecord.mHandler

                .findRouterWithSessionLocked(uniqueSessionId);
@@ -1086,6 +1162,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "transferToRouteWithManager | manager: %d, session: %s, route: %s",

                managerRecord.mManagerId, uniqueSessionId, route.getId()));



        // Can be null if the session is system's or RCN.

        RouterRecord routerRecord = managerRecord.mUserRecord.mHandler

                .findRouterWithSessionLocked(uniqueSessionId);
@@ -1107,6 +1187,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "setSessionVolumeWithManager | manager: %d, session: %s, volume: %d",

                managerRecord.mManagerId, uniqueSessionId, volume));



        long uniqueRequestId = toUniqueRequestId(managerRecord.mManagerId, requestId);

        managerRecord.mUserRecord.mHandler.sendMessage(

                obtainMessage(UserHandler::setSessionVolumeOnHandler,
@@ -1124,6 +1208,10 @@ class MediaRouter2ServiceImpl { 
            return;

        }



        Slog.i(TAG, TextUtils.formatSimple(

                "releaseSessionWithManager | manager: %d, session: %s",

                managerRecord.mManagerId, uniqueSessionId));



        RouterRecord routerRecord = managerRecord.mUserRecord.mHandler

                .findRouterWithSessionLocked(uniqueSessionId);
@@ -1484,6 +1572,24 @@ class MediaRouter2ServiceImpl { 


            List<IMediaRouter2> routersWithModifyAudioRoutingPermission = getRouters(true);

            List<IMediaRouter2> routersWithoutModifyAudioRoutingPermission = getRouters(false);



            if (!addedRoutes.isEmpty()) {

                // If routes were added, currentInfo cannot be null.

                Slog.i(TAG,

                        toLoggingMessage(

                                /* source= */ "addProviderRoutes",

                                currentInfo.getUniqueId(),

                                (ArrayList) addedRoutes));

            }

            if (!removedRoutes.isEmpty()) {

                // If routes were removed, prevInfo cannot be null.

                Slog.i(TAG,

                        toLoggingMessage(

                                /* source= */ "removeProviderRoutes",

                                prevInfo.getUniqueId(),

                                (ArrayList) removedRoutes));

            }



            List<IMediaRouter2Manager> managers = getManagers();

            List<MediaRoute2Info> defaultRoute = new ArrayList<>();

            defaultRoute.add(mSystemProvider.getDefaultRoute());
@@ -1522,6 +1628,16 @@ class MediaRouter2ServiceImpl { 
            }

        }



        private static String toLoggingMessage(

                String source, String providerId, ArrayList<MediaRoute2Info> routes) {

            String routesString =

                    routes.stream()

                            .map(it -> String.format("%s | %s", it.getOriginalId(), it.getName()))

                            .collect(Collectors.joining(/* delimiter= */ ", "));

            return TextUtils.formatSimple("%s | provider: %s, routes: [%s]",

                    source, providerId, routesString);

        }



        private int getLastProviderInfoIndex(@NonNull String providerId) {

            for (int i = 0; i < mLastProviderInfos.size(); i++) {

                MediaRoute2ProviderInfo providerInfo = mLastProviderInfos.get(i);