commit 7b1973bfb8e1ce985acabd0ba02d6b74dcad5c66
author TreeHugger Robot <treehugger-gerrit@google.com> Wed May 15 00:46:17 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 00:46:17 2019 +0000
tree abfe07a398b8c6ecbc2d479cc7a8ae1535ca7adc
parent 35fcd6b0e3cf41fb1ffae707e3ae6e558623ba48
parent f105c93c4aa6d1cbebe94c5c8d7d6297258f6fc9

Merge "Offload role manager work to background thread" into qt-dev

services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java

diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index e1ffb0f..d77ea6e 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -77,6 +77,7 @@
 import com.android.internal.util.Preconditions;
 import com.android.server.FgThread;
 import com.android.server.LocalServices;
+import com.android.server.SystemServerInitThreadPool;
 import com.android.server.SystemService;
 import com.android.server.UiThread;
 import com.android.server.soundtrigger.SoundTriggerInternal;
@@ -1283,7 +1284,9 @@
                 mRm.addOnRoleHoldersChangedListenerAsUser(executor, this, UserHandle.ALL);
                 UserHandle currentUser = UserHandle.of(LocalServices.getService(
                         ActivityManagerInternal.class).getCurrentUserId());
-                onRoleHoldersChanged(RoleManager.ROLE_ASSISTANT, currentUser);
+                SystemServerInitThreadPool.get().submit(() -> onRoleHoldersChanged(
+                        RoleManager.ROLE_ASSISTANT, currentUser),
+                        "VoiceInteractionManagerService RoleObserver initialization");
             }
 
             private @NonNull String getDefaultRecognizer(@NonNull UserHandle user) {