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

Commit 0a4b5c82 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by Android (Google) Code Review
Browse files

Merge "Prevent multiple calls of ActivityThread.systemMain()"

parents 2e81641b 8f2c59c0

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

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

        }

        if (sThread == null) {

        if (sThread == null) {

            Looper.prepare();

            Looper.prepare();

            sThread = ActivityThread.systemMain();

            sThread = ActivityThread.currentActivityThread();

            Context context = sThread.getSystemContext();

            Context context = sThread.getSystemContext();

            sMediaSessionManager =

            sMediaSessionManager =

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

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