Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff6f1c5e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update MediaSessionService to comply with Android's inclusive language...

Merge "Update MediaSessionService to comply with Android's inclusive language guidance" am: fc236dbd am: 3335cb4a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1402408

Change-Id: I9bbc796eec14b26eb7237f6a45bd374c696755b5
parents cb5c7ad1 3335cb4a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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