From c00c31e97e7756efde01682aeabc06de20d560ef Mon Sep 17 00:00:00 2001 From: Hai Zhang Date: Mon, 3 Jun 2019 18:50:33 +0000 Subject: [PATCH] Revert "Offload role manager work to background thread" This reverts commit f105c93c4aa6d1cbebe94c5c8d7d6297258f6fc9. Reason for revert: b/132974796#23 the offloaded thread will be holding a lock for a noticeable period of time and cause contention. Bug: 132974796 Change-Id: Ic81a2e3ee7226266c8f97b606fc1a2834240f689 --- .../voiceinteraction/VoiceInteractionManagerService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java index d77ea6e41cc24..e1ffb0f179f84 100644 --- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java +++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java @@ -77,7 +77,6 @@ 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; @@ -1284,9 +1283,7 @@ class RoleObserver implements OnRoleHoldersChangedListener { mRm.addOnRoleHoldersChangedListenerAsUser(executor, this, UserHandle.ALL); UserHandle currentUser = UserHandle.of(LocalServices.getService( ActivityManagerInternal.class).getCurrentUserId()); - SystemServerInitThreadPool.get().submit(() -> onRoleHoldersChanged( - RoleManager.ROLE_ASSISTANT, currentUser), - "VoiceInteractionManagerService RoleObserver initialization"); + onRoleHoldersChanged(RoleManager.ROLE_ASSISTANT, currentUser); } private @NonNull String getDefaultRecognizer(@NonNull UserHandle user) {