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

MediaSessionService: Replace Log.wtf() with Log.w()

Browse Source 
Log.wtf() should be used only if it's enough to restart system, so
replace it with Log.w() when it's not.

Bug: 118987354
Test: Build
Change-Id: If40f5519d36c40873dba8f6eaae9fd5a7f92c753
This commit is contained in:
Jaewan Kim
2019-02-12 23:06:46 +09:00
parent 12288221e6
commit 32e90552a5
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
services/core/java/com/android/server/media/MediaSessionServiceImpl.java
View File

@@ -284,13 +284,16 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
* Tells the system UI that volume has changed on an active remote session.
*/
public void notifyRemoteVolumeChanged(int flags, MediaSessionRecord session) {
if (mRvc == null || !session.isActive()) {
return;
}
try {
mRvc.remoteVolumeChanged(session.getSessionToken(), flags);
} catch (Exception e) {
Log.wtf(TAG, "Error sending volume change to system UI.", e);
synchronized (mLock) {
if (mRvc == null || !session.isActive()) {
return;
}
try {
mRvc.remoteVolumeChanged(session.getSessionToken(), flags);
} catch (Exception e) {
Log.w(TAG, "Error sending volume change to system UI.", e);
mRvc = null;
}
}
}
@@ -563,7 +566,7 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
String callerPackageName, SessionCallbackLink cb, String tag) {
FullUserRecord user = getFullUserRecordLocked(userId);
if (user == null) {
Log.wtf(TAG, "Request from invalid user: " + userId);
Log.w(TAG, "Request from invalid user: " + userId + ", pkg=" + callerPackageName);
throw new RuntimeException("Session request from invalid user.");
}
@@ -643,7 +646,8 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
MediaSessionRecord record = user.mPriorityStack.getDefaultRemoteSession(userId);
mRvc.updateRemoteController(record == null ? null : record.getSessionToken());
} catch (RemoteException e) {
Log.wtf(TAG, "Error sending default remote volume to sys ui.", e);
Log.w(TAG, "Error sending default remote volume to sys ui.", e);
mRvc = null;
}
}
}
@@ -1661,7 +1665,9 @@ public class MediaSessionServiceImpl extends MediaSessionService.ServiceImpl {
final long token = Binder.clearCallingIdentity();
try {
enforceSystemUiPermission("listen for volume changes", pid, uid);
mRvc = rvc;
synchronized (mLock) {
mRvc = rvc;
}
} finally {
Binder.restoreCallingIdentity(token);
}