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

Extract updating binding intent

Browse Source 
This is a step in a larger refactoring.
This also fixes logging of the unsuccessful intent.

Bug: 205676419
Test: make
Change-Id: I4141939a974064e19009194a19acfd1edea7b3c5
This commit is contained in:
Nikolas Havrikov
2021-11-08 13:41:10 +01:00
parent 67723bf299
commit 430e1722e3
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -2509,15 +2509,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
unbindCurrentMethodLocked();
setCurIntent(new Intent(InputMethod.SERVICE_INTERFACE));
getCurIntent().setComponent(info.getComponent());
getCurIntent().putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.input_method_binding_label);
getCurIntent().putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(
mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS),
PendingIntent.FLAG_IMMUTABLE));
Intent intent = createImeBindingIntent(info.getComponent());
setCurIntent(intent);
if (bindCurrentInputMethodServiceLocked(getCurIntent(), this, mImeConnectionBindFlags)) {
if (bindCurrentInputMethodServiceLocked(intent, this, mImeConnectionBindFlags)) {
setLastBindTime(SystemClock.uptimeMillis());
setHasConnection(true);
setCurId(info.getId());
@@ -2537,10 +2532,22 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
null, null, getCurId(), getSequenceNumber(), false);
}
setCurIntent(null);
Slog.w(TAG, "Failure connecting to input method service: " + getCurIntent());
Slog.w(TAG, "Failure connecting to input method service: " + intent);
return InputBindResult.IME_NOT_CONNECTED;
}
@NonNull
private Intent createImeBindingIntent(ComponentName component) {
Intent intent = new Intent(InputMethod.SERVICE_INTERFACE);
intent.setComponent(component);
intent.putExtra(Intent.EXTRA_CLIENT_LABEL,
com.android.internal.R.string.input_method_binding_label);
intent.putExtra(Intent.EXTRA_CLIENT_INTENT, PendingIntent.getActivity(
mContext, 0, new Intent(Settings.ACTION_INPUT_METHOD_SETTINGS),
PendingIntent.FLAG_IMMUTABLE));
return intent;
}
@FunctionalInterface
interface ImeDisplayValidator {
@DisplayImePolicy int getDisplayImePolicy(int displayId);