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

Extract reusing current connection logic

Browse Source 
Bug: 205676419
Test: make
Change-Id: Iea3dff8bd25d4404e4164c32db1216418cffbc62
This commit is contained in:
Nikolas Havrikov
2021-11-09 12:39:20 +01:00
parent 0170114696
commit 95b509ea98
1 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2467,31 +2467,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
return attachNewInputLocked(startInputReason,
(startInputFlags & StartInputFlags.INITIAL_CONNECTION) != 0);
}
if (hasConnection()) {
if (mCurMethod != null) {
// Return to client, and we will get back with it when
// we have had a session made for it.
requestClientSessionLocked(cs);
return new InputBindResult(
InputBindResult.ResultCode.SUCCESS_WAITING_IME_SESSION,
null, null, getCurId(), getSequenceNumber(), false);
} else if (SystemClock.uptimeMillis()
< (getLastBindTime() + TIME_TO_RECONNECT)) {
// In this case we have connected to the service, but
// don't yet have its interface. If it hasn't been too
// long since we did the connection, we'll return to
// the client and wait to get the service interface so
// we can report back. If it has been too long, we want
// to fall through so we can try a disconnect/reconnect
// to see if we can get back in touch with the service.
return new InputBindResult(
InputBindResult.ResultCode.SUCCESS_WAITING_IME_BINDING,
null, null, getCurId(), getSequenceNumber(), false);
} else {
EventLog.writeEvent(EventLogTags.IMF_FORCE_RECONNECT_IME,
getSelectedMethodId(), SystemClock.uptimeMillis() - getLastBindTime(),
0);
}
InputBindResult bindResult = tryReuseConnectionLocked(cs);
if (bindResult != null) {
return bindResult;
}
}
@@ -2528,6 +2507,37 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
}
}
@GuardedBy("mMethodMap")
@Nullable
private InputBindResult tryReuseConnectionLocked(@NonNull ClientState cs) {
if (hasConnection()) {
if (mCurMethod != null) {
// Return to client, and we will get back with it when
// we have had a session made for it.
requestClientSessionLocked(cs);
return new InputBindResult(
InputBindResult.ResultCode.SUCCESS_WAITING_IME_SESSION,
null, null, getCurId(), getSequenceNumber(), false);
} else if (SystemClock.uptimeMillis()
< (getLastBindTime() + TIME_TO_RECONNECT)) {
// In this case we have connected to the service, but
// don't yet have its interface. If it hasn't been too
// long since we did the connection, we'll return to
// the client and wait to get the service interface so
// we can report back. If it has been too long, we want
// to fall through so we can try a disconnect/reconnect
// to see if we can get back in touch with the service.
return new InputBindResult(
InputBindResult.ResultCode.SUCCESS_WAITING_IME_BINDING,
null, null, getCurId(), getSequenceNumber(), false);
} else {
EventLog.writeEvent(EventLogTags.IMF_FORCE_RECONNECT_IME,
getSelectedMethodId(), SystemClock.uptimeMillis() - getLastBindTime(), 0);
}
}
return null;
}
@NonNull
private Intent createImeBindingIntent(ComponentName component) {
Intent intent = new Intent(InputMethod.SERVICE_INTERFACE);