Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6b8e7b35: am bf20aa76: Merge "Keep track of who has disabled applications." into jb-mr2-dev

Browse Source 
* commit '6b8e7b35ef763d29a30c87a5a95ef941d39a8ee9':
  Keep track of who has disabled applications.
This commit is contained in:
Dianne Hackborn
2013-03-27 16:40:49 -07:00
committed by Android Git Automerger
parent 97207ab966 6b8e7b35ef
commit d734b4f285
9 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/InputMethodManagerService.java
View File

@@ -1603,7 +1603,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) {
}