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

Merge "MediaSession2Service: Log ControllerInfo in connection process" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-18 01:08:21 +00:00
committed by Android (Google) Code Review
parent dd3667e8bb 664c45bad5
commit 10a591bc43
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/apex/java/android/media/MediaSession2Service.java
View File

@@ -370,10 +370,6 @@ public abstract class MediaSession2Service extends Service {
}
return;
}
if (DEBUG) {
Log.d(TAG, "Handling incoming connection request from the"
+ " controller, controller=" + caller + ", uid=" + uid);
}
String callingPkg = connectionRequest.getString(KEY_PACKAGE_NAME);
// The Binder.getCallingPid() can be 0 for an oneway call from the
@@ -389,13 +385,18 @@ public abstract class MediaSession2Service extends Service {
caller,
connectionRequest.getBundle(KEY_CONNECTION_HINTS));
if (DEBUG) {
Log.d(TAG, "Handling incoming connection request from the"
+ " controller=" + controllerInfo);
}
final MediaSession2 session;
session = service.onGetSession(controllerInfo);
if (session == null) {
if (DEBUG) {
Log.d(TAG, "Rejecting incoming connection request from the"
+ " controller, controller=" + caller + ", uid=" + uid);
+ " controller=" + controllerInfo);
}
// Note: Trusted controllers also can be rejected according to the
// service implementation.