Android Build Merger (Role)
26aaadd3b5
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe am: b91acca082
...
Change-Id: I0cbca14aed609ab81556ee1deb72ef1e0e294256
2018-03-09 00:35:48 +00:00
Android Build Merger (Role)
b91acca082
[automerger] [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService am: 5a28e533fe
...
Change-Id: I09ac593ade4e725b560384042304f93f451b5be5
2018-03-09 00:35:42 +00:00
Eugene Susla
5a28e533fe
[DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
...
Fixes: 73511076, 73311729
Test: presubmit
Change-Id: Ie98f67ffee4744050ac85d8b229370a16a76a194
(cherry picked from commit 726b51a26e
2018-03-09 00:35:39 +00:00
Chen Xu
69a071e55c
Merge \\"DO NOT MERGE revert system api loadSafeLabel\\" into mnc-dev am: d2e2288fe3
...
am: 59fc768893
2016-07-06 23:29:51 +00:00
fionaxu
59fc768893
Merge \"DO NOT MERGE revert system api loadSafeLabel\" into mnc-dev
...
am: d2e2288fe3
2016-07-06 23:24:04 +00:00
fionaxu
99973d9852
DO NOT MERGE revert system api loadSafeLabel
...
Bug: 28557603
Change-Id: Ib2dd0fc19217655a4d6b49cdf49ce36dfd6577d5
2016-06-30 17:57:46 -07:00
Erik Wolsheimer
eae242cfe8
Merge "DO NOT MERGE ANYWHERE Fix NPE when UID has no packages." into cw-e-dev
2016-06-09 03:25:43 +00:00
fionaxu
c10e4fae05
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717
...
am: c95d552de0
2016-06-08 18:11:09 +00:00
fionaxu
c95d552de0
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c
...
am: 698e044717
2016-06-08 17:23:27 +00:00
fionaxu
698e044717
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e
...
am: 965084dd0c
2016-06-08 17:11:49 +00:00
fionaxu
965084dd0c
resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e
...
am: 1e8fe12f4e
2016-06-08 17:04:09 +00:00
fionaxu
c196526f8e
resolve merge conflicts of 2c53526 to lmp-mr1-dev
...
Change-Id: I4fe45fae0a98934ac9b0f6f48c8cab8546392641
2016-06-07 22:01:19 -07:00
fionaxu
2c53526b4b
Backport loadSafeLabel changes am: be2865a60a am: 4c50846519
...
am: 9a825b0fd5
2016-06-07 23:23:10 +00:00
fionaxu
9a825b0fd5
Backport loadSafeLabel changes am: be2865a60a
...
am: 4c50846519
2016-06-07 23:20:04 +00:00
fionaxu
4c50846519
Backport loadSafeLabel changes
...
am: be2865a60a
2016-06-07 23:13:08 +00:00
fionaxu
be2865a60a
Backport loadSafeLabel changes
...
Bug:23531798
Bug:28557603
Change-Id: Iee49f7c37d6a42fe74077bb15ed47919d351d172
2016-06-07 22:51:28 +00:00
Erik Wolsheimer
2379796e11
DO NOT MERGE ANYWHERE Fix NPE when UID has no packages.
...
CP of 377ded0fce
2016-06-06 10:49:02 -07:00
Todd Kennedy
ca133845ef
DO NOT MERGE Fix intent filter priorities am: 60351d3
...
am: 3dfc6d9
2016-04-11 22:06:38 +00:00
Todd Kennedy
bd770bc97b
DO NOT MERGE Fix intent filter priorities am: eeb970a
...
am: cd24c4e
2016-04-11 22:06:35 +00:00
Todd Kennedy
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
2016-04-11 22:00:27 +00:00
Todd Kennedy
cd24c4ebc0
DO NOT MERGE Fix intent filter priorities
...
am: eeb970a
2016-04-11 22:00:26 +00:00
Todd Kennedy
60351d3be2
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
NOTE: I had to bring in pieces of ag/526831 so intent filters could
be collected and matched
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-07 16:40:18 -07:00
Todd Kennedy
eeb970ada1
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 13:56:59 -07:00
Todd Kennedy
d6174e7402
DO NOT MERGE Fix intent filter priorities
...
Since this is a backport, there is only one rule that guards intent
filter priorities:
1) Updates will NOT be granted a priority greater than the priority
defined on the system image.
Bug: 27450489
Change-Id: Ifcec4d7a59e684331399abc41eea1bd6876155a4
2016-04-05 10:20:41 -07:00
Matthew Williams
5fc753acaf
DO NOT MERGE Redact Account info from getCurrentSyncs am: a5cafd2a93
...
am: 06ef7dfdf0
2016-01-21 18:14:32 +00:00
Matthew Williams
06ef7dfdf0
DO NOT MERGE Redact Account info from getCurrentSyncs
...
am: a5cafd2a93
2016-01-21 18:07:55 +00:00
Matthew Williams
a5cafd2a93
DO NOT MERGE Redact Account info from getCurrentSyncs
...
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698
2016-01-21 14:15:11 +00:00
Matthew Williams
85f169d19f
Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c am: 0f292147f3
...
am: ce3842eb1a
2016-01-20 18:08:33 +00:00
Matthew Williams
ce3842eb1a
Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e am: a947baa87c
...
am: 0f292147f3
2016-01-20 11:55:52 +00:00
Matthew Williams
0f292147f3
Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb am: be136b7a3e
...
am: a947baa87c
2016-01-20 11:51:42 +00:00
Matthew Williams
a947baa87c
Redact Account info from getCurrentSyncs am: f39549e389 am: 1a0aed3257 am: 0e7cd0a9fb
...
am: be136b7a3e
2016-01-20 11:46:39 +00:00
Matthew Williams
0e7cd0a9fb
Redact Account info from getCurrentSyncs am: f39549e389
...
am: 1a0aed3257
2016-01-20 11:37:17 +00:00
Matthew Williams
1a0aed3257
Redact Account info from getCurrentSyncs
...
am: f39549e389
2016-01-20 11:32:56 +00:00
Matthew Williams
f39549e389
Redact Account info from getCurrentSyncs
...
BUG:26094635
If the caller to ContentResolver#getCurrentSyncs does not hold the
GET_ACCOUNTS permission, return a SyncInfo object that does not
contain any Account information.
Change-Id: I5628ebe1f56c8e3f784aaf1b3281e6b829d19314
(cherry picked from commit b63057e698
2016-01-20 00:02:58 +00:00
Matthew Williams
af5c9f809c
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f am: 6d13650c74
...
am: c455148edc
2015-11-13 02:09:35 +00:00
Matthew Williams
c455148edc
Sync extras bundle comparison can throw NPE am: c0f39c1ece am: 34b700a7c2 am: a0d20db02f
...
am: 6d13650c74
2015-11-13 02:03:01 +00:00
Matthew Williams
a0d20db02f
Sync extras bundle comparison can throw NPE am: c0f39c1ece
...
am: 34b700a7c2
2015-11-13 01:50:11 +00:00
Shreyas Basarge
cc7c1d3812
Sync extras bundle comparison can throw NPE am: 2f137b7705
...
am: 294611faa8
2015-11-13 01:50:02 +00:00
Shreyas Basarge
294611faa8
Sync extras bundle comparison can throw NPE
...
am: 2f137b7705
2015-11-13 01:41:59 +00:00
Matthew Williams
34b700a7c2
Sync extras bundle comparison can throw NPE
...
am: c0f39c1ece
2015-11-13 01:41:59 +00:00
Shreyas Basarge
2f137b7705
Sync extras bundle comparison can throw NPE
...
Bug: 23591205
Change-Id: I960dfcc1584c0a17685790d5d722eaf11b930e25
2015-11-12 15:32:44 +00:00
Matthew Williams
c0f39c1ece
Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033
2015-11-11 14:34:04 +00:00
Jeff Sharkey
637d05eb5c
Merge "Handle "uninstalled" apps when pruning app-ops." into mnc-dr-dev
...
am: a975732a83
2015-10-30 21:37:17 +00:00
Jeff Sharkey
e2ed23e6b2
Handle "uninstalled" apps when pruning app-ops.
...
During system boot, we prune app-ops belonging to apps that have
been uninstalled. However, apps installed on adopted storage devices
haven't been scanned at this point, so they appear to be uninstalled.
To avoid pruning app-ops for these apps, we need a getPackageUid()
variant that also considers "uninstalled" apps for which we still
have PackageSetting values.
Bug: 25206071
Change-Id: I1820f674d45c5ddc1c5f10ed7d859e7025005e28
2015-10-29 19:04:15 -07:00
Anthony Hugh
3575a40009
Add intent extra for determining if apps are system apps
...
This is being added to help identify system apps so that
the UI can filter on that type.
BUG: 24955055
Change-Id: Ie4be3717ce997f60eeb48a389c0f54ce5803141a
2015-10-26 17:47:05 -07:00
Jeff Sharkey
257d2ca7fd
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
...
am: 55d2b6e8e6
2015-10-21 00:55:05 +00:00
Jeff Sharkey
55d2b6e8e6
Merge "Correctly derive ABI for apps on adopted media." into mnc-dr-dev
2015-10-21 00:48:47 +00:00
Jeff Sharkey
bbcb331205
Correctly derive ABI for apps on adopted media.
...
There was a bug causing PackageManager to think apps on adopted media
were actually in an ASEC, causing it to skip ABI derivation. This
change fixes the issue by copying the volume UUID into place early
in the scanning process.
Also fixes two places where we had incorrectly been including apps
on adopted media; switched them to check only for ASECs.
Bug: 24583803
Change-Id: If66d1bce02824a4d8e22f741b04a2abda0378cfb
2015-10-20 17:32:05 -07:00
Matthew Williams
cb937cbc6a
DO NOT MERGE Sync extras bundle comparison can throw NPE
...
am: 7d7a2254bc
2015-10-20 20:42:07 +00:00
Matthew Williams
7d7a2254bc
DO NOT MERGE Sync extras bundle comparison can throw NPE
...
BUG: 23591205
Change-Id: Ic6404c0befe70c34b078e0eae6a627826173d82c
(cherry picked from commit 9ad2c84033
2015-10-20 18:55:30 +00:00
