Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "When logging route id, also log package name" into udc-dev

Browse Source
This commit is contained in:
Santiago Seifert
2023-04-22 10:44:04 +00:00
committed by Android (Google) Code Review
parent 23b3a96f73 70e3c92955
commit 3d3fc71b21
1 changed files with 53 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
services/core/java/com/android/server/media/MediaRouter2ServiceImpl.java
View File

@@ -764,7 +764,7 @@ class MediaRouter2ServiceImpl {
userRecord.mHandler, routerRecord)); userRecord.mHandler, routerRecord));
Slog.i(TAG, TextUtils.formatSimple( Slog.i(TAG, TextUtils.formatSimple(
"registerRouter2 | package: %s, uid: %d, pid: %d, router: %d", "registerRouter2 | package: %s, uid: %d, pid: %d, router id: %d",
packageName, uid, pid, routerRecord.mRouterId)); packageName, uid, pid, routerRecord.mRouterId));
} }
@@ -776,10 +776,11 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"unregisterRouter2 | package: %s, router: %d", TAG,
routerRecord.mPackageName, TextUtils.formatSimple(
routerRecord.mRouterId)); "unregisterRouter2 | package: %s, router id: %d",
routerRecord.mPackageName, routerRecord.mRouterId));
UserRecord userRecord = routerRecord.mUserRecord; UserRecord userRecord = routerRecord.mUserRecord;
userRecord.mRouterRecords.remove(routerRecord); userRecord.mRouterRecords.remove(routerRecord);
@@ -806,9 +807,14 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"setDiscoveryRequestWithRouter2 | router: %d, discovery request: %s", TAG,
routerRecord.mRouterId, discoveryRequest.toString())); TextUtils.formatSimple(
"setDiscoveryRequestWithRouter2 | router: %s(id: %d), discovery request:"
+ " %s",
routerRecord.mPackageName,
routerRecord.mRouterId,
discoveryRequest.toString()));
routerRecord.mDiscoveryPreference = discoveryRequest; routerRecord.mDiscoveryPreference = discoveryRequest;
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
@@ -832,10 +838,12 @@ class MediaRouter2ServiceImpl {
.collect(Collectors.joining(",")) .collect(Collectors.joining(","))
: null; : null;
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"setRouteListingPreference | router: %d, route listing preference: [%s]", TAG,
routerRecord.mRouterId, TextUtils.formatSimple(
routeListingAsString)); "setRouteListingPreference | router: %s(id: %d), route listing preference:"
+ " [%s]",
routerRecord.mPackageName, routerRecord.mRouterId, routeListingAsString));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage( obtainMessage(
@@ -851,9 +859,11 @@ class MediaRouter2ServiceImpl {
RouterRecord routerRecord = mAllRouterRecords.get(binder); RouterRecord routerRecord = mAllRouterRecords.get(binder);
if (routerRecord != null) { if (routerRecord != null) {
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"setRouteVolumeWithRouter2 | router: %d, volume: %d", TAG,
routerRecord.mRouterId, volume)); TextUtils.formatSimple(
"setRouteVolumeWithRouter2 | router: %s(id: %d), volume: %d",
routerRecord.mPackageName, routerRecord.mRouterId, volume));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::setRouteVolumeOnHandler, obtainMessage(UserHandler::setRouteVolumeOnHandler,
@@ -935,9 +945,11 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"selectRouteWithRouter2 | router: %d, route: %s", TAG,
routerRecord.mRouterId, route.getId())); TextUtils.formatSimple(
"selectRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::selectRouteOnHandler, obtainMessage(UserHandler::selectRouteOnHandler,
@@ -954,9 +966,11 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"deselectRouteWithRouter2 | router: %d, route: %s", TAG,
routerRecord.mRouterId, route.getId())); TextUtils.formatSimple(
"deselectRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::deselectRouteOnHandler, obtainMessage(UserHandler::deselectRouteOnHandler,
@@ -973,9 +987,11 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"transferToRouteWithRouter2 | router: %d, route: %s", TAG,
routerRecord.mRouterId, route.getId())); TextUtils.formatSimple(
"transferToRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
String defaultRouteId = String defaultRouteId =
routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId(); routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId();
@@ -1002,9 +1018,14 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"setSessionVolumeWithRouter2 | router: %d, session: %s, volume: %d", TAG,
routerRecord.mRouterId, uniqueSessionId, volume)); TextUtils.formatSimple(
"setSessionVolumeWithRouter2 | router: %s(id: %d), session: %s, volume: %d",
routerRecord.mPackageName,
routerRecord.mRouterId,
uniqueSessionId,
volume));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::setSessionVolumeOnHandler, obtainMessage(UserHandler::setSessionVolumeOnHandler,
@@ -1021,9 +1042,11 @@ class MediaRouter2ServiceImpl {
return; return;
} }
Slog.i(TAG, TextUtils.formatSimple( Slog.i(
"releaseSessionWithRouter2 | router: %d, session: %s", TAG,
routerRecord.mRouterId, uniqueSessionId)); TextUtils.formatSimple(
"releaseSessionWithRouter2 | router: %s(id: %d), session: %s",
routerRecord.mPackageName, routerRecord.mRouterId, uniqueSessionId));
routerRecord.mUserRecord.mHandler.sendMessage( routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::releaseSessionOnHandler, obtainMessage(UserHandler::releaseSessionOnHandler,