summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-18 04:23:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-18 04:23:47 +0000
commitbd1b8ff06c7ce16105e974b83b0079f110f5d8bd (patch)
treed0298006128547684608006280392d936357f137
parentbd9e396d1cc1c86e9e33bfb6744b47891997d4e0 (diff)
parentff6f1c5eadd3f9aaf6384d8a8c67d1b1d54e6ba3 (diff)
Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c am: ff6f1c5ead
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408 Change-Id: Ib0114b9c32c7b062586472570e1cb565eed452ae
-rw-r--r--services/core/java/com/android/server/media/MediaSessionService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 9b356f0e8eef..9e91a9f0ab68 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -1928,7 +1928,7 @@ public class MediaSessionService extends SystemService implements Monitor {
final int userId = UserHandle.getUserId(uid);
final long token = Binder.clearCallingIdentity();
try {
- // Don't perform sanity check between controllerPackageName and controllerUid.
+ // Don't perform check between controllerPackageName and controllerUid.
// When an (activity|service) runs on the another apps process by specifying
// android:process in the AndroidManifest.xml, then PID and UID would have the
// running process' information instead of the (activity|service) that has created