Loading services/core/java/com/android/server/inputmethod/InputMethodBindingController.java +6 −14 Original line number Diff line number Diff line Loading @@ -31,7 +31,6 @@ import android.inputmethodservice.InputMethodService; import android.os.Binder; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; import android.os.UserHandle; Loading @@ -39,7 +38,6 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.EventLog; import android.util.Slog; import android.view.IWindowManager; import android.view.WindowManager; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodInfo; Loading @@ -66,7 +64,6 @@ final class InputMethodBindingController { @NonNull private final ArrayMap<String, InputMethodInfo> mMethodMap; @NonNull private final InputMethodUtils.InputMethodSettings mSettings; @NonNull private final PackageManagerInternal mPackageManagerInternal; @NonNull private final IWindowManager mIWindowManager; @NonNull private final WindowManagerInternal mWindowManagerInternal; @NonNull private final Resources mRes; Loading Loading @@ -107,7 +104,6 @@ final class InputMethodBindingController { mMethodMap = mService.mMethodMap; mSettings = mService.mSettings; mPackageManagerInternal = mService.mPackageManagerInternal; mIWindowManager = mService.mIWindowManager; mWindowManagerInternal = mService.mWindowManagerInternal; mRes = mService.mRes; } Loading Loading @@ -432,17 +428,13 @@ final class InputMethodBindingController { mService.setCurTokenDisplayIdLocked(displayIdToShowIme); try { if (DEBUG) { Slog.v(TAG, "Adding window token: " + mCurToken + " for display: " + displayIdToShowIme); } mIWindowManager.addWindowToken(mCurToken, WindowManager.LayoutParams.TYPE_INPUT_METHOD, mWindowManagerInternal.addWindowToken(mCurToken, WindowManager.LayoutParams.TYPE_INPUT_METHOD, displayIdToShowIme, null /* options */); } catch (RemoteException e) { Slog.e(TAG, "Could not add window token " + mCurToken + " for display " + displayIdToShowIme, e); } } @GuardedBy("ImfLock.class") Loading Loading
services/core/java/com/android/server/inputmethod/InputMethodBindingController.java +6 −14 Original line number Diff line number Diff line Loading @@ -31,7 +31,6 @@ import android.inputmethodservice.InputMethodService; import android.os.Binder; import android.os.IBinder; import android.os.Process; import android.os.RemoteException; import android.os.SystemClock; import android.os.Trace; import android.os.UserHandle; Loading @@ -39,7 +38,6 @@ import android.provider.Settings; import android.util.ArrayMap; import android.util.EventLog; import android.util.Slog; import android.view.IWindowManager; import android.view.WindowManager; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodInfo; Loading @@ -66,7 +64,6 @@ final class InputMethodBindingController { @NonNull private final ArrayMap<String, InputMethodInfo> mMethodMap; @NonNull private final InputMethodUtils.InputMethodSettings mSettings; @NonNull private final PackageManagerInternal mPackageManagerInternal; @NonNull private final IWindowManager mIWindowManager; @NonNull private final WindowManagerInternal mWindowManagerInternal; @NonNull private final Resources mRes; Loading Loading @@ -107,7 +104,6 @@ final class InputMethodBindingController { mMethodMap = mService.mMethodMap; mSettings = mService.mSettings; mPackageManagerInternal = mService.mPackageManagerInternal; mIWindowManager = mService.mIWindowManager; mWindowManagerInternal = mService.mWindowManagerInternal; mRes = mService.mRes; } Loading Loading @@ -432,17 +428,13 @@ final class InputMethodBindingController { mService.setCurTokenDisplayIdLocked(displayIdToShowIme); try { if (DEBUG) { Slog.v(TAG, "Adding window token: " + mCurToken + " for display: " + displayIdToShowIme); } mIWindowManager.addWindowToken(mCurToken, WindowManager.LayoutParams.TYPE_INPUT_METHOD, mWindowManagerInternal.addWindowToken(mCurToken, WindowManager.LayoutParams.TYPE_INPUT_METHOD, displayIdToShowIme, null /* options */); } catch (RemoteException e) { Slog.e(TAG, "Could not add window token " + mCurToken + " for display " + displayIdToShowIme, e); } } @GuardedBy("ImfLock.class") Loading