Ajay Panicker
438cc52ca1
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1
...
am: 8fd324c33f
2016-09-21 21:55:46 +00:00
Ajay Panicker
8fd324c33f
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
...
am: 786e2694b1
2016-09-21 21:15:56 +00:00
Ajay Panicker
3758253ae8
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2) am: edae39d59a
...
am: 271e34dbd5
2016-09-20 23:55:44 +00:00
Ajay Panicker
271e34dbd5
[DO NOT MERGE] Fix setPairingConfirmation permissions issue (2/2)
...
am: edae39d59a
2016-09-20 23:49:05 +00:00
Ajay Panicker
786e2694b1
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
...
Bug: 28672558
Change-Id: I4bc14bd7f098e34012c2ae1eeba2d439145901f0
2016-09-13 21:09:44 +00:00
Ajay Panicker
edae39d59a
[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 11:01:29 -07:00
Narayan Kamath
b56f4f53e1
Process: Fix communication with zygote. am: 8e69dd2284
...
am: b85e9e9108
2016-08-18 09:56:24 +00:00
Narayan Kamath
b85e9e9108
Process: Fix communication with zygote.
...
am: 8e69dd2284
2016-08-18 09:50:52 +00:00
Narayan Kamath
8e69dd2284
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 17:21:49 +01:00
fionaxu
a3b851d352
DO NOT MERGE revert public api loadSafeLabel am: f44c73abb2
...
am: a0263a9909
2016-06-30 22:31:52 +00:00
fionaxu
a0263a9909
DO NOT MERGE revert public api loadSafeLabel
...
am: f44c73abb2
2016-06-30 22:25:47 +00:00
fionaxu
f44c73abb2
DO NOT MERGE revert public api loadSafeLabel
...
Bug: 28557603
Change-Id: Ic9d9ae0b59fe86f70aaea311380cacf222ee3a0c
2016-06-27 23:52:19 -07:00
Christopher Tate
6633a4fee4
DO NOT MERGE: Don\\'t trust callers to supply app info to bindBackupAgent() am: d85a4ed283
...
am: f615799ef2
2016-06-16 22:27:18 +00:00
Christopher Tate
f615799ef2
DO NOT MERGE: Don\'t trust callers to supply app info to bindBackupAgent()
...
am: d85a4ed283
2016-06-16 22:21:25 +00:00
Christopher Tate
d85a4ed283
DO NOT MERGE: 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: I62710b15bb601fdfedd68e32349168c10725eb45
2016-06-14 13:28:33 -07:00
fionaxu
84f479f6b5
DO NOT MERGE fix build breakage on k am: 4e33c4f8b1
...
am: 07c994012c
2016-06-08 01:59:04 +00:00
fionaxu
07c994012c
DO NOT MERGE fix build breakage on k
...
am: 4e33c4f8b1
2016-06-08 01:49:39 +00:00
fionaxu
4e33c4f8b1
DO NOT MERGE fix build breakage on k
...
Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
2016-06-07 17:55:27 -07: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
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
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
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
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
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
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
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
Ricardo Cervera
92f6a74708
docs: Added info on noHistory and onActivityResult(). Bug: 13807256
...
Change-Id: Iae4901a311e76401396f89c552e5b27a49c65c83
2014-11-05 08:55:51 -08:00
Mark Renouf
e69bebd5aa
Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE
...
BUG: 18130296
Change-Id: Iaee21a45e8e84c6bf8d99b04382e43ec12606ce6
2014-10-30 21:03:25 +00:00
Jeff Hao
a67c6f0162
Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]
...
Needed to bypass new access checks for fields, methods, and
constructors.
Change-Id: I8ff0b44a6cb4f4af1c72734bca366d8b89528030
(cherry picked from commit e3abd2ccbe
2014-10-01 12:47:40 -07:00
Jon Larimer
d65ab58705
am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit 'e2b12b1fbc2880bf895fa2a9adcf65de3162c28f':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:33:07 +00:00
Jon Larimer
e2b12b1fbc
am 61c6ff7b: Merge "Fix issue #16794553 : Duplicate ArrayMap entries in Bundle..." into klp-dev
...
* commit '61c6ff7b70e2d42b44d5c5f9c3c8e3c67b584a76':
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
2014-09-11 16:23:39 +00:00
Dianne Hackborn
92a5b0d59f
Fix issue #16794553 : Duplicate ArrayMap entries in Bundle...
...
...can lead to launching of un-exported activities
We now validate the array map after unparcelling to make sure there
are no duplicate keys.
And to make up for the performance overhead this introduces, I switched
the parcelling/unparcelling code to write keys as explicit string
objects rather than generic values. There was no reason to use generic
values since the write method itself only accepts an array map with
String keys.
Change-Id: I57bda9eb79ceaaa9c1b94ad49d9e462b52102149
(cherry picked from commit cee4cdad307071a8ff9a3e2189bf9e6fcc417222)
2014-09-10 21:55:27 +00:00
