summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-18 04:59:47 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-18 04:59:47 +0000
commit7d55904e6e4a52432375b33cbfcd5058067cafb2 (patch)
tree31f0b0d926866bb5713d29e2d8f2a5d768d02a74
parent4f93042048e8587f1a3abac5aa62caa5052d7611 (diff)
parenta7b5165e3b36da0ea9d130b369cf641ef0ab70f1 (diff)
Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c am: ff6f1c5ead am: bd1b8ff06c am: a7b5165e3b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408 Change-Id: If95c9ff120f4ae9d86fc516d06de468cce2fdc0a
-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 a8a0e2e937d0..9521611c241d 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -1918,7 +1918,7 @@ public class MediaSessionService extends SystemService implements Monitor {
final int userId = UserHandle.getUserHandleForUid(uid).getIdentifier();
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