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

2021-01-26 01:39:30 +00:00
parent 2aa95e8da1 9c4853d363
commit de3b7f1aea
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/media/MediaShellCommand.java
+++ b/services/core/java/com/android/server/media/MediaShellCommand.java
@@ -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);