Amith Yamasani ecd5afe1ef resolved conflicts for merge of 069d7e9b to master ...

Change-Id: Ia8fd5de3d4cc275fd358132bcb2c198d1e7b6877

2013-05-09 17:07:08 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

Fix issue #8768456: Settings > App Info under reports...

2013-05-02 11:17:15 -07:00

KeySetManager.java

Remove keysets from PackageKeySetData when KeySetManager removes them.

2013-03-26 17:52:21 -07:00

PackageKeySetData.java

Remove keysets from PackageKeySetData when KeySetManager removes them.

2013-03-26 17:52:21 -07:00

PackageManagerService.java

am 4c41f6cd: am 856a5a86: Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev

2013-05-02 15:17:32 -07:00

PackageSetting.java

User management and switching

2012-03-27 11:23:01 -07:00

PackageSettingBase.java

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

2013-03-27 16:40:49 -07:00

PackageSignatures.java

…

PackageVerificationResponse.java

…

PackageVerificationState.java

Allow verifiers to extend timeout

2012-08-23 15:39:02 -07:00

PendingPackage.java

…

PreferredActivity.java

Improve configuration of default preferred apps.

2013-01-29 15:18:29 -08:00

PreferredIntentResolver.java

Initial implementation of IntentFirewall functionality

2013-04-02 21:18:41 -07:00

SELinuxMMAC.java

Remove /data/system location for mac_permissions.xml.

2013-04-05 13:38:02 -04:00

Settings.java

am 69fe4069: am 006c6338: Merge "Fix bug in initializing preferred activities." into jb-mr2-dev

2013-04-02 12:11:54 -07:00

SharedUserSetting.java

…

UserManagerService.java

Cache the scaled avatar drawables in the keyguard user switcher

2013-05-09 14:44:38 -07:00