summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFyodor Kupolov <fkupolov@google.com>2016-09-09 10:36:30 -0700
committergitbuildkicker <android-build@google.com>2016-10-12 19:23:07 -0700
commit874ec8c2e86fa573558ab45bc9a256987b89a8d3 (patch)
treed5b5cd0b9a4662281fb9d9cd70a787893187d11c
parent48ce97a2e92c2d956619a106249d190adfb223aa (diff)
downloadbase-874ec8c2e86fa573558ab45bc9a256987b89a8d3.tar.gz
Fixed a bug with incorrect handling of onUnlockUser
userId should be passed as arg1 instead of obj. Bug: 31321500 Change-Id: I11e8c146d83773c73ec6bb5f5cfac566759b7bcc (cherry picked from commit 0f57cce644ae8b5bb87de3e7fba9e9c00f9a0b1a)
-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 652a3fe18116..df1b6f51bc33 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 */));
}
}