Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-03 21:48:24 +00:00
committed by Android (Google) Code Review
parent 575f58e26c c00c31e97e
commit b13d88af52
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
View File

@@ -77,7 +77,6 @@ import com.android.internal.util.DumpUtils;
import com.android.internal.util.Preconditions; import com.android.internal.util.Preconditions;
import com.android.server.FgThread; import com.android.server.FgThread;
import com.android.server.LocalServices; import com.android.server.LocalServices;
import com.android.server.SystemServerInitThreadPool;
import com.android.server.SystemService; import com.android.server.SystemService;
import com.android.server.UiThread; import com.android.server.UiThread;
import com.android.server.soundtrigger.SoundTriggerInternal; import com.android.server.soundtrigger.SoundTriggerInternal;
@@ -1284,9 +1283,7 @@ public class VoiceInteractionManagerService extends SystemService {
mRm.addOnRoleHoldersChangedListenerAsUser(executor, this, UserHandle.ALL); mRm.addOnRoleHoldersChangedListenerAsUser(executor, this, UserHandle.ALL);
UserHandle currentUser = UserHandle.of(LocalServices.getService( UserHandle currentUser = UserHandle.of(LocalServices.getService(
ActivityManagerInternal.class).getCurrentUserId()); ActivityManagerInternal.class).getCurrentUserId());
SystemServerInitThreadPool.get().submit(() -> onRoleHoldersChanged( onRoleHoldersChanged(RoleManager.ROLE_ASSISTANT, currentUser);
RoleManager.ROLE_ASSISTANT, currentUser),
"VoiceInteractionManagerService RoleObserver initialization");
} }
private @NonNull String getDefaultRecognizer(@NonNull UserHandle user) { private @NonNull String getDefaultRecognizer(@NonNull UserHandle user) {