Merge "Keep track of who has disabled applications." into jb-mr2-dev

2013-03-27 23:32:35 +00:00
parent f7fa08b702 3fa3c28a35
commit bf20aa767e
9 changed files with 57 additions and 23 deletions
--- 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) {
                }