summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-18 04:44:53 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-18 04:44:53 +0000
commita7b5165e3b36da0ea9d130b369cf641ef0ab70f1 (patch)
treeaeb54277d70508d3aa927acb0cf11492224ee904
parentdb5cafa88bfa87773bc34638bf5b403cbb42d7ef (diff)
parentbd1b8ff06c7ce16105e974b83b0079f110f5d8bd (diff)
Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbda4 am: 3335cb4a3c am: ff6f1c5ead am: bd1b8ff06c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408 Change-Id: I5b33ca0d4777cce8010573ba5ab182761b550192
-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