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

Commit c62ec99f authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Automerger Merge Worker
Browse files

Merge "Prevent multiple calls of ActivityThread.systemMain()" into rvc-qpr-dev am: de3b7f1a 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad8fb5c18c68300b2c01548abd3798cfccb445a5
parents 15ad2d97 de3b7f1a

services/core/java/com/android/server/media/MediaShellCommand.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class MediaShellCommand extends ShellCommand { 
        }

        if (sThread == null) {

            Looper.prepare();

            sThread = ActivityThread.systemMain();

            sThread = ActivityThread.currentActivityThread();

            Context context = sThread.getSystemContext();

            sMediaSessionManager =

                    (MediaSessionManager) context.getSystemService(Context.MEDIA_SESSION_SERVICE);