From 9c4853d363603f44adbc7a257f5f5fbc7a2de880 Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Wed, 6 Jan 2021 02:59:37 +0000
Subject: [PATCH] Prevent multiple calls of ActivityThread.systemMain()

Bug: 170591440
Test: manually
Change-Id: Iba6d10e5203fa1c1f96c85e39a57483ee26e8111
(cherry picked from commit 8f2c59c0cba7a40adc6a8dac613566b1c43f9f6c)
---
 .../core/java/com/android/server/media/MediaShellCommand.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/media/MediaShellCommand.java b/services/core/java/com/android/server/media/MediaShellCommand.java
index 20df271a1de2a..b199325798f4b 100644
--- 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);