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

Commit 43e49fd3 authored by Antonio Kantek's avatar Antonio Kantek Committed by Android (Google) Code Review
Browse files

Merge "Skip headless user when reset all IME users" into main

parents 5c8bcb31 9d4bf2b8

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL; 
import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;

import static android.os.IServiceManager.DUMP_FLAG_PROTO;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.os.UserManager.USER_TYPE_SYSTEM_HEADLESS;

import static android.provider.Settings.Secure.STYLUS_HANDWRITING_DEFAULT_VALUE;

import static android.provider.Settings.Secure.STYLUS_HANDWRITING_ENABLED;

import static android.server.inputmethod.InputMethodManagerServiceProto.BACK_DISPOSITION;
@@ -6459,6 +6460,11 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
                    if (!userHasDebugPriv(userId, shellCommand)) {

                        continue;

                    }

                    // Skip on headless user

                    if (USER_TYPE_SYSTEM_HEADLESS.equals(

                            mUserManagerInternal.getUserInfo(userId).userType)) {

                        continue;

                    }

                    final String nextIme;

                    final List<InputMethodInfo> nextEnabledImes;

                    if (userId == mSettings.getCurrentUserId()) {