summaryrefslogtreecommitdiffstats
path: root/services/core
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2015-05-06 23:08:03 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-06 23:08:05 +0000
commit7afd01e2f1c0235f5d5a95744200d6739d6fcaa4 (patch)
tree332e411554b8fb99514cc38c0fa05acfe0eb4870 /services/core
parentc2ec334079375ac6a4337bd5b94e173534b51129 (diff)
parentccee75966ae00e9a2426df09c0aa8610e145ad72 (diff)
downloadframeworks_base-7afd01e2f1c0235f5d5a95744200d6739d6fcaa4.zip
frameworks_base-7afd01e2f1c0235f5d5a95744200d6739d6fcaa4.tar.gz
frameworks_base-7afd01e2f1c0235f5d5a95744200d6739d6fcaa4.tar.bz2
Merge "Do nothing if hideSoftInput is called from not focused client." into mnc-dev
Diffstat (limited to 'services/core')
-rw-r--r--services/core/java/com/android/server/InputMethodManagerService.java2
1 files changed, 0 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 759a6be..9511f54 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -2038,11 +2038,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
if (!mIWindowManager.inputMethodClientHasFocus(client)) {
if (DEBUG) Slog.w(TAG, "Ignoring hideSoftInput of uid "
+ uid + ": " + client);
- setImeWindowVisibilityStatusHiddenLocked();
return false;
}
} catch (RemoteException e) {
- setImeWindowVisibilityStatusHiddenLocked();
return false;
}
}