diff options
author | Dianne Hackborn <hackbod@google.com> | 2013-03-27 23:32:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-27 23:32:36 +0000 |
commit | bf20aa767e7a56b3c1e05c6d2a8b140fd1c18dd0 (patch) | |
tree | 81724f2b1ec4bd7c1ee6d93055ab71c91e95bcaa /services/java/com/android/server/InputMethodManagerService.java | |
parent | f7fa08b7024fa91001080a766cd9ac8eab82d634 (diff) | |
parent | 3fa3c28a356108a6558b6b54a0b10e1a5cc4f1b6 (diff) |
Merge "Keep track of who has disabled applications." into jb-mr2-dev
Diffstat (limited to 'services/java/com/android/server/InputMethodManagerService.java')
-rw-r--r-- | services/java/com/android/server/InputMethodManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 2d53023d3a0a..3b541ec3963b 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -1598,7 +1598,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub == PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED) { mIPackageManager.setApplicationEnabledSetting(imm.getPackageName(), PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, - PackageManager.DONT_KILL_APP, mSettings.getCurrentUserId()); + PackageManager.DONT_KILL_APP, mSettings.getCurrentUserId(), + mContext.getBasePackageName()); } } catch (RemoteException e) { } |