commit de3b7f1aea3cd8267b9b007f43a4a8276059deb2
author Sungsoo Lim <sungsoo@google.com> Tue Jan 26 01:39:30 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 26 01:39:30 2021 +0000
tree abacc0a9c2f096d8858a6e7f1f59a1766c592011
parent 2aa95e8da17f82227dd9ef54f4e8208495896a37
parent 9c4853d363603f44adbc7a257f5f5fbc7a2de880

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

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

diff --git a/services/core/java/com/android/server/media/MediaShellCommand.java b/services/core/java/com/android/server/media/MediaShellCommand.java
index 20df271..b199325 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 @@
         }
         if (sThread == null) {
             Looper.prepare();
-            sThread = ActivityThread.systemMain();
+            sThread = ActivityThread.currentActivityThread();
             Context context = sThread.getSystemContext();
             sMediaSessionManager =
                     (MediaSessionManager) context.getSystemService(Context.MEDIA_SESSION_SERVICE);