Ben Gruver 5e20733107 resolved conflicts for merge of 2ab72e1f to master ...

Change-Id: I752332dfb1a2f15bac22d3f1a457ae1ef20cf240

2013-04-03 17:46:19 -07:00

..

BasePermission.java

…

GrantedPermissions.java

…

Installer.java

Add seinfo parsing to PackageManagerService.

2013-03-25 17:30:08 -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

resolved conflicts for merge of 2ab72e1f to master

2013-04-03 17:46:19 -07:00

PackageSetting.java

…

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

…

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

Add data validation on seinfo labels.

2013-03-28 12:19:27 -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

Improve RestrictionEntry API

2013-03-29 17:28:47 -07:00