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

When logging route id, also log package name

Browse Source 
Makes it much easier to follow the logs: Saves looking
at the dumpsys to map the id to an app. Also, the id
can change if the app gets restarted, which means the
dumpsys no longer contains the corresponding router
id after the app restarts.

Bug: 257039897
Test: adb logcat --buffer system | grep MR2ServiceImpl
Change-Id: I4a77cc4617025fc06009e71c7d96caea9e101878
Merged-In: I4a77cc4617025fc06009e71c7d96caea9e101878
This commit is contained in:
Santiago Seifert
2023-04-19 16:20:53 +00:00
parent 2b31afee53
commit 70e3c92955
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));
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));
}
@@ -776,10 +776,11 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"unregisterRouter2 | package: %s, router: %d",
routerRecord.mPackageName,
routerRecord.mRouterId));
Slog.i(
TAG,
TextUtils.formatSimple(
"unregisterRouter2 | package: %s, router id: %d",
routerRecord.mPackageName, routerRecord.mRouterId));
UserRecord userRecord = routerRecord.mUserRecord;
userRecord.mRouterRecords.remove(routerRecord);
@@ -806,9 +807,14 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"setDiscoveryRequestWithRouter2 | router: %d, discovery request: %s",
routerRecord.mRouterId, discoveryRequest.toString()));
Slog.i(
TAG,
TextUtils.formatSimple(
"setDiscoveryRequestWithRouter2 | router: %s(id: %d), discovery request:"
+ " %s",
routerRecord.mPackageName,
routerRecord.mRouterId,
discoveryRequest.toString()));
routerRecord.mDiscoveryPreference = discoveryRequest;
routerRecord.mUserRecord.mHandler.sendMessage(
@@ -832,10 +838,12 @@ class MediaRouter2ServiceImpl {
.collect(Collectors.joining(","))
: null;
Slog.i(TAG, TextUtils.formatSimple(
"setRouteListingPreference | router: %d, route listing preference: [%s]",
routerRecord.mRouterId,
routeListingAsString));
Slog.i(
TAG,
TextUtils.formatSimple(
"setRouteListingPreference | router: %s(id: %d), route listing preference:"
+ " [%s]",
routerRecord.mPackageName, routerRecord.mRouterId, routeListingAsString));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(
@@ -851,9 +859,11 @@ class MediaRouter2ServiceImpl {
RouterRecord routerRecord = mAllRouterRecords.get(binder);
if (routerRecord != null) {
Slog.i(TAG, TextUtils.formatSimple(
"setRouteVolumeWithRouter2 | router: %d, volume: %d",
routerRecord.mRouterId, volume));
Slog.i(
TAG,
TextUtils.formatSimple(
"setRouteVolumeWithRouter2 | router: %s(id: %d), volume: %d",
routerRecord.mPackageName, routerRecord.mRouterId, volume));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::setRouteVolumeOnHandler,
@@ -935,9 +945,11 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"selectRouteWithRouter2 | router: %d, route: %s",
routerRecord.mRouterId, route.getId()));
Slog.i(
TAG,
TextUtils.formatSimple(
"selectRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::selectRouteOnHandler,
@@ -954,9 +966,11 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"deselectRouteWithRouter2 | router: %d, route: %s",
routerRecord.mRouterId, route.getId()));
Slog.i(
TAG,
TextUtils.formatSimple(
"deselectRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::deselectRouteOnHandler,
@@ -973,9 +987,11 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"transferToRouteWithRouter2 | router: %d, route: %s",
routerRecord.mRouterId, route.getId()));
Slog.i(
TAG,
TextUtils.formatSimple(
"transferToRouteWithRouter2 | router: %s(id: %d), route: %s",
routerRecord.mPackageName, routerRecord.mRouterId, route.getId()));
String defaultRouteId =
routerRecord.mUserRecord.mHandler.mSystemProvider.getDefaultRoute().getId();
@@ -1002,9 +1018,14 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"setSessionVolumeWithRouter2 | router: %d, session: %s, volume: %d",
routerRecord.mRouterId, uniqueSessionId, volume));
Slog.i(
TAG,
TextUtils.formatSimple(
"setSessionVolumeWithRouter2 | router: %s(id: %d), session: %s, volume: %d",
routerRecord.mPackageName,
routerRecord.mRouterId,
uniqueSessionId,
volume));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::setSessionVolumeOnHandler,
@@ -1021,9 +1042,11 @@ class MediaRouter2ServiceImpl {
return;
}
Slog.i(TAG, TextUtils.formatSimple(
"releaseSessionWithRouter2 | router: %d, session: %s",
routerRecord.mRouterId, uniqueSessionId));
Slog.i(
TAG,
TextUtils.formatSimple(
"releaseSessionWithRouter2 | router: %s(id: %d), session: %s",
routerRecord.mPackageName, routerRecord.mRouterId, uniqueSessionId));
routerRecord.mUserRecord.mHandler.sendMessage(
obtainMessage(UserHandler::releaseSessionOnHandler,