Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c00c31e9 authored by Hai Zhang's avatar Hai Zhang
Browse files

Revert "Offload role manager work to background thread" 

This reverts commit f105c93c.

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
parent f105c93c

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

+1 −4
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ import com.android.internal.util.DumpUtils; 
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 @@ public class VoiceInteractionManagerService extends SystemService { 
                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) {