Jeff Sharkey 0ab7007631 resolve merge conflicts of 358f0d4fc8 to master ...

Bug: 174932174
Test: I solemnly swear I tested this conflict resolution.
Exempt-From-Owner-Approval: refactoring with team leads buy-in
Change-Id: I9262a08ffc1ccede8e519d0eed90ed2bfcf0232c

2020-12-08 11:01:05 -07:00

..

IOnPermissionsChangeListener.aidl

…

IPermissionController.aidl

…

IPermissionManager.aidl

Remove obsolete is/setPermissionEnforced().

2020-12-04 23:06:02 -08:00

OWNERS

Improve OWNERS coverage across frameworks/base/.

2020-12-08 08:36:27 -07:00

PermissionControllerManager.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

PermissionControllerService.java

Add changeId to gate R-QPR tests behind

2020-08-12 00:21:40 +00:00

PermissionManager.java

Merge "Do not allow to install S+ apps with cross cert permissions"

2020-10-22 00:14:32 +00:00

PermissionManagerInternal.java

Move or refactor PermissionManagerInternal APIs.

2020-12-04 23:05:59 -08:00

Permissions.md

Migrate away from deprecated Truth APIs.

2020-10-13 11:45:45 -07:00

RuntimePermissionPresentationInfo.aidl

…

RuntimePermissionPresentationInfo.java

Remove @TestApi from @SystemApi symbols

2020-10-20 09:04:03 +01:00

RuntimePermissionUsageInfo.aidl

…

RuntimePermissionUsageInfo.java

…

TEST_MAPPING

Allow tests for more PermissionControllerManager methods

2020-04-26 17:52:41 -07:00