Ajay Panicker
0ea21bc70e
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
...
setPairingConfirmation was set to only require BLUETOOTH_ADMIN
permission which shouldn't be able to set the confirmation itself.
This is restricted to BLUETOOTH_PRIVILEGED permission.
Bug: 29043989
Change-Id: Iddc935f0b02f5ff56e930914b4b664377e786184
2016-09-08 18:03:58 +00:00
Narayan Kamath
e29c6493c0
Process: Fix communication with zygote.
...
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug: 30143607
(cherry-picked from commit 448be0a622
2016-08-16 16:17:29 +00:00
fionaxu
0fffbcb158
DO NOT MERGE revert public api loadSafeLabel
...
Bug: 28557603
Change-Id: I61f4939864228fb50112502044da599b9cec2430
2016-06-28 00:43:35 -07:00
Christopher Tate
c58054f25f
Don't trust callers to supply app info to bindBackupAgent()
...
Get the canonical identity and metadata about the package from the
Package Manager at time of usage rather than rely on the caller to
have gotten things right, even when the caller has the system uid.
Bug 28795098
Change-Id: I215786bc894dedf7ca28e9c80cefabd0e40ca877
2016-06-14 13:28:43 -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
Paul Jensen
6c35cf2434
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff
...
am: bb27626141
2016-05-26 13:44:37 +00:00
Paul Jensen
bb27626141
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff
...
am: 8940d2b0ff
2016-05-26 13:37:24 +00:00
Paul Jensen
8940d2b0ff
Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev
...
am: af0b4466ff
2016-05-26 13:30:59 +00:00
Paul Jensen
08ec0e53b8
Don't pass URL path and username/password to PAC scripts
...
The URL path could contain credentials that apps don't want exposed
to a potentially malicious PAC script.
Bug: 27593919
Change-Id: I4bb0362fc91f70ad47c4c7453d77d6f9a1e8eeed
2016-04-29 10:57:13 +00: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
3dfc6d986f
DO NOT MERGE Fix intent filter priorities
...
am: 60351d3
2016-04-11 22:00:27 +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
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
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
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
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
Paul Jensen
ece4ac2105
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into lmp-dev
2015-09-23 10:59:31 +00:00
Paul Jensen
a9e9834314
Merge "Fix NOT_RESTRICTED network capability and enforce it." into lmp-dev
2015-09-23 10:58:57 +00:00
Zach Jang
fe4cbf2b1b
am cff4e09e: am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'cff4e09e26e3b976aa0273df78e89f592fc6d287':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:24:00 +00:00
Zach Jang
cff4e09e26
am bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
...
* commit 'bdf7f3583c637f370e97e74526df14b9c70e6493':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
2015-09-17 20:09:55 +00:00
Zach Jang
1cf21e443a
DO NOT MERGE - Backport of ag/748165 to klp-dev
...
Security patch level in Settings
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:20:27 +00:00
Zach Jang
bdf7f3583c
DO NOT MERGE - Backport of ag/748165 to klp-dev
...
Security patch level in Settings
b/23946860
Change-Id: I610d4dedf18fe1825d7df5febf29e6f0c006490d
2015-09-17 01:17:58 +00:00
Paul Jensen
2b6af396ad
Don't mark NetworkRequests restricted when they don't have restricted caps
...
Requests without NET_CAPABILITIES_INTERNET and just the default network
capabilities should not be marked restricted. Without this fix apps
can hit permissions exceptions if they inadvertently make requests
without NET_CAPABILITIES_INTERNET.
Bug:23164917
Change-Id: I4c7136821315bcb05dfc42ffbc505a5d4f6109e6
(cherry picked from commit aae613d961
2015-08-28 12:50:09 -04:00
Paul Jensen
a12044215b
Fix NOT_RESTRICTED network capability and enforce it.
...
With this change:
1. NOT_RESTRICTED should be removed from NetworkRequests that bring up
special restricted carrier networks (e.g. IMS, FOTA).
2. NetworkRequests without NOT_RESTRICTED require CONNECTIVITY_INTERNAL
permission to register
3. Binding sockets to networks without NOT_RESTRICTED requires
CONNECTIVITY_INTERNAL permission
Bug:21637535
Change-Id: I5991d39facaa6b690e969fe15dcbeec52e918321
(cherry picked from commit 487ffe7d3d
2015-08-28 12:48:11 -04:00
Svetoslav
bf0652eeea
DO NOT MERGE Don't take flags when creating app widget config activity.
...
bug:19618745
Change-Id: Ib0e421454d343e6db55d5538f1d55ac22a3dd722
2015-06-01 12:55:38 -07:00
Craig Mautner
8fa394fa8c
Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-dev
2015-03-04 16:09:29 +00:00
Joe Fernandez
c4418980a0
am a31378dc: Merge "Minor typo fixes in managed profile Javadoc reference pages." into lmp-docs
...
* commit 'a31378dc49868412a2e632bcc46a44877a9b397f':
Minor typo fixes in managed profile Javadoc reference pages.
2015-03-03 06:15:29 +00:00
Andrew Solovay
27f5337841
Minor typo fixes in managed profile Javadoc reference pages.
...
See first comment for stage location.
bug: 19389235
Change-Id: I2e1d5169a77e3f4000e73f08d493953ce4eee78c
2015-03-02 17:22:18 -08:00
Craig Mautner
40f616b1f6
Do not make ActivityContainer available to apps. DO NOT MERGE
...
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.
Fixes bug 19394591.
Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-19 09:44:53 -08:00
John Spurlock
42d3b66f48
am e0852368: Fix a few typos in Parcel.java.
...
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
Fix a few typos in Parcel.java.
2015-02-05 20:18:03 +00:00
John Spurlock
e08523684d
Fix a few typos in Parcel.java.
...
Change-Id: Ic1674fc72f08a0f3536b4870a5ce7d14ee6fcc16
2015-02-04 23:18:09 +00:00
Jon Larimer
9570e144fe
am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:43:47 +00:00
Jon Larimer
ea63fd7f9b
am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '88add68942694fc643518bcf5c26f6c3df7e9aa0':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:36:59 +00:00
Jon Larimer
88add68942
am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'a5ccca242747d59233ec5ecebc20d4a721e7850e':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:32:09 +00:00
Jon Larimer
a5ccca2427
am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit '2982d64802ed0d5b59130680c43485e9d7862e50':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:25:28 +00:00
Jon Larimer
2982d64802
am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'de9a76ed997c300a6c5f2f82c517719503af9045':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:12:01 +00:00
Jon Larimer
de9a76ed99
am fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev
...
* commit 'fc731e6e40f6f449b8e7ac72c2cd36a57c04a32b':
Fix ParceledListSlice to enforce the same concrete types among its elements.
2015-01-29 18:00:58 +00:00
Adam Lesinski
f741c37273
Fix ParceledListSlice to enforce the same concrete types among its elements.
...
Bug:17671747
Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
(cherry picked from commit 3df1c38ee0
2015-01-28 10:47:54 +00:00
Ricardo Cervera
93f94c2ca5
resolved conflicts for merge of e8f6bd48 to lmp-dev
...
Change-Id: Idc370182914d5060a721d34c26cd72598f2c6dff
2015-01-16 09:54:30 -08:00
Ricardo Cervera
97c4ba9862
docs: Added info on noHistory and onActivityResult().
...
Bug: 13807256
Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83
Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f
2015-01-16 09:24:30 -08:00
Ricardo Cervera
e8f6bd4846
am 98f07d90: am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
...
* commit '98f07d901492335f51258655fbfa032fa3f2d58e':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:21:32 +00:00
Ricardo Cervera
98f07d9014
am 92f6a747: docs: Added info on noHistory and onActivityResult(). Bug: 13807256
...
* commit '92f6a747085b4b5ed692de4bdb0050c096eae393':
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
2015-01-16 17:14:44 +00:00
