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

Commit c75355ce authored by Hai Zhang's avatar Hai Zhang Committed by android-build-merger
Browse files

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

am: b13d88af

Change-Id: Ib75d72f1a2bb74ff85d408fd3ddc403091f5ddcb
parents 7b2c7ce4 b13d88af

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) {