summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fyodor Kupolov <fkupolov@google.com> 2016-09-09 21:36:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-09-09 21:36:03 +0000
commit05918fd12344990a38c38276ed483d01291415d7 (patch)
tree30aff9266b9f805daadc4331c36a055ecec5ef25
parentb0666c61b1b8aa33e9482179dd819670e09acdcc (diff)
parent0f57cce644ae8b5bb87de3e7fba9e9c00f9a0b1a (diff)
Merge "Fixed a bug with incorrect handling of onUnlockUser" into nyc-dr1-dev
-rw-r--r--services/core/java/com/android/server/InputMethodManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index 71ac54492cb6..8ae491707542 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -822,7 +822,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
public void onUnlockUser(final @UserIdInt int userHandle) {
// Called on ActivityManager thread.
mService.mHandler.sendMessage(mService.mHandler.obtainMessage(MSG_SYSTEM_UNLOCK_USER,
- userHandle));
+ userHandle /* arg1 */, 0 /* arg2 */));
}
}