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

am: b13d88af52

Change-Id: Ib75d72f1a2bb74ff85d408fd3ddc403091f5ddcb
This commit is contained in:
Hai Zhang
2019-06-03 15:07:34 -07:00
committed by android-build-merger

View File

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