From be5406b44fc60d95dc6827f04ab29f5bed6df8e4 Mon Sep 17 00:00:00 2001 From: Jin Seok Park Date: Thu, 9 Jul 2020 00:46:29 +0900 Subject: [PATCH] Change Slog usage to Log There are currently no plans to make Slog into @SystemApi. See b/143145452 for reference. Bug: 160780506 Test: build Change-Id: I03c8719f377989e50967687b1857ce535ea50612 --- .../server/media/MediaSessionRecord.java | 49 +++++++++---------- .../server/media/MediaSessionService.java | 7 ++- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/services/core/java/com/android/server/media/MediaSessionRecord.java b/services/core/java/com/android/server/media/MediaSessionRecord.java index dbf1abc0ca70a..0f6748366e169 100644 --- a/services/core/java/com/android/server/media/MediaSessionRecord.java +++ b/services/core/java/com/android/server/media/MediaSessionRecord.java @@ -50,7 +50,6 @@ import android.os.RemoteException; import android.os.ResultReceiver; import android.os.SystemClock; import android.util.Log; -import android.util.Slog; import android.view.KeyEvent; import com.android.server.LocalServices; @@ -996,7 +995,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR } return true; } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in sendMediaRequest.", e); + Log.e(TAG, "Remote failure in sendMediaRequest.", e); } return false; } @@ -1013,7 +1012,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR } return true; } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in sendMediaRequest.", e); + Log.e(TAG, "Remote failure in sendMediaRequest.", e); } return false; } @@ -1023,7 +1022,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onCommand(packageName, pid, uid, command, args, cb); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in sendCommand.", e); + Log.e(TAG, "Remote failure in sendCommand.", e); } } @@ -1032,7 +1031,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onCustomAction(packageName, pid, uid, action, args); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in sendCustomAction.", e); + Log.e(TAG, "Remote failure in sendCustomAction.", e); } } @@ -1040,7 +1039,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPrepare(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in prepare.", e); + Log.e(TAG, "Remote failure in prepare.", e); } } @@ -1049,7 +1048,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPrepareFromMediaId(packageName, pid, uid, mediaId, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in prepareFromMediaId.", e); + Log.e(TAG, "Remote failure in prepareFromMediaId.", e); } } @@ -1058,7 +1057,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPrepareFromSearch(packageName, pid, uid, query, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in prepareFromSearch.", e); + Log.e(TAG, "Remote failure in prepareFromSearch.", e); } } @@ -1066,7 +1065,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPrepareFromUri(packageName, pid, uid, uri, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in prepareFromUri.", e); + Log.e(TAG, "Remote failure in prepareFromUri.", e); } } @@ -1074,7 +1073,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPlay(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in play.", e); + Log.e(TAG, "Remote failure in play.", e); } } @@ -1083,7 +1082,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPlayFromMediaId(packageName, pid, uid, mediaId, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in playFromMediaId.", e); + Log.e(TAG, "Remote failure in playFromMediaId.", e); } } @@ -1092,7 +1091,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPlayFromSearch(packageName, pid, uid, query, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in playFromSearch.", e); + Log.e(TAG, "Remote failure in playFromSearch.", e); } } @@ -1100,7 +1099,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPlayFromUri(packageName, pid, uid, uri, extras); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in playFromUri.", e); + Log.e(TAG, "Remote failure in playFromUri.", e); } } @@ -1108,7 +1107,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onSkipToTrack(packageName, pid, uid, id); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in skipToTrack", e); + Log.e(TAG, "Remote failure in skipToTrack", e); } } @@ -1116,7 +1115,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPause(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in pause.", e); + Log.e(TAG, "Remote failure in pause.", e); } } @@ -1124,7 +1123,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onStop(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in stop.", e); + Log.e(TAG, "Remote failure in stop.", e); } } @@ -1132,7 +1131,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onNext(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in next.", e); + Log.e(TAG, "Remote failure in next.", e); } } @@ -1140,7 +1139,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onPrevious(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in previous.", e); + Log.e(TAG, "Remote failure in previous.", e); } } @@ -1148,7 +1147,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onFastForward(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in fastForward.", e); + Log.e(TAG, "Remote failure in fastForward.", e); } } @@ -1156,7 +1155,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onRewind(packageName, pid, uid); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in rewind.", e); + Log.e(TAG, "Remote failure in rewind.", e); } } @@ -1164,7 +1163,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onSeekTo(packageName, pid, uid, pos); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in seekTo.", e); + Log.e(TAG, "Remote failure in seekTo.", e); } } @@ -1172,7 +1171,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onRate(packageName, pid, uid, rating); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in rate.", e); + Log.e(TAG, "Remote failure in rate.", e); } } @@ -1180,7 +1179,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onSetPlaybackSpeed(packageName, pid, uid, speed); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in setPlaybackSpeed.", e); + Log.e(TAG, "Remote failure in setPlaybackSpeed.", e); } } @@ -1194,7 +1193,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR mCb.onAdjustVolume(packageName, pid, uid, direction); } } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in adjustVolume.", e); + Log.e(TAG, "Remote failure in adjustVolume.", e); } } @@ -1202,7 +1201,7 @@ public class MediaSessionRecord implements IBinder.DeathRecipient, MediaSessionR try { mCb.onSetVolumeTo(packageName, pid, uid, value); } catch (RemoteException e) { - Slog.e(TAG, "Remote failure in setVolumeTo.", e); + Log.e(TAG, "Remote failure in setVolumeTo.", e); } } diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 375804a395efd..9a83242a5955e 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -75,7 +75,6 @@ import android.provider.Settings; import android.speech.RecognizerIntent; import android.text.TextUtils; import android.util.Log; -import android.util.Slog; import android.util.SparseArray; import android.util.SparseIntArray; import android.view.KeyEvent; @@ -1140,7 +1139,7 @@ public class MediaSessionService extends SystemService implements Monitor { } return sessionBinder; } catch (Exception e) { - Slog.w(TAG, "Exception in creating a new session", e); + Log.w(TAG, "Exception in creating a new session", e); throw e; } finally { Binder.restoreCallingIdentity(token); @@ -1351,7 +1350,7 @@ public class MediaSessionService extends SystemService implements Monitor { if (!isUserSetupComplete()) { // Global media key handling can have the side-effect of starting new // activities which is undesirable while setup is in progress. - Slog.i(TAG, "Not dispatching media key event because user " + Log.i(TAG, "Not dispatching media key event because user " + "setup is in progress."); return; } @@ -1361,7 +1360,7 @@ public class MediaSessionService extends SystemService implements Monitor { if (isGlobalPriorityActive && uid != Process.SYSTEM_UID) { // Prevent dispatching key event through reflection while the global // priority session is active. - Slog.i(TAG, "Only the system can dispatch media key event " + Log.i(TAG, "Only the system can dispatch media key event " + "to the global priority session."); return; }