Commit Graph

255075 Commits

Author SHA1 Message Date
Jaewan Kim
5b05226586 Merge "DO NOT MERGE Check caller for sending media key to telephony service" into klp-dev 2016-09-22 05:19:37 +00:00
Ajay Panicker
630d577349 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours am: d4fe288933
am: f65661939b

Change-Id: I05d4bdc92834197058c77ae31113c9783b558d8e
2016-09-22 04:58:44 +00:00
Ajay Panicker
f6d8037708 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours am: 1448a693d8
am: 3d4c737736

Change-Id: Ic23e1121dda4b85e5064c8d47a142da41617f321
2016-09-22 04:57:53 +00:00
Ajay Panicker
73607db5a1 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours am: a70fffe8e7
am: d677e8d413

Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7
2016-09-22 04:57:01 +00:00
Ajay Panicker
993015ce9a [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours am: c56c079470
am: 1783182332

Change-Id: Ia62f75205e5d8406249991175fc5cf66d1f2bdb9
2016-09-22 04:56:04 +00:00
Etan Cohen
3501748dea Merge "[NAN] Method renames based on API council feedback"
am: dcac00f325

Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a
2016-09-22 04:55:21 +00:00
Jaewan Kim
b2403f3102 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13
am: 78fa55e261

Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33
2016-09-22 04:55:18 +00:00
Ajay Panicker
ed82c6fac8 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f am: 438cc52ca1 -s ours
am: 7f84596929  -s ours

Change-Id: Ia1485d87e224d8fb870b50bc73f4ee6e93dd48e4
2016-09-22 04:54:32 +00:00
Jaewan Kim
ff1c1993b7 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106
am: 868d586c98

Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab
2016-09-22 04:54:25 +00:00
Gopal Krishna Shukla
f7abcda5f2 Provide synchronization to setview to avoid NPE
If setView() will be called from two different threads
then mView property of a View object may have inconsistent
value. For instance, setView() may set mView to null causing
NullPointerException. Synchronize root.setView() as well to
avoid this.

Change-Id: I5f9cf47ece5d4aca575bd8644ecfcee0ed43d843
2016-09-22 04:48:24 +00:00
Jaewan Kim
4167620d33 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2 am: bea0b3ec06 -s ours
am: 91ccfa1def

Change-Id: I9f76004fe1ef3b54b187414281874f34e2ff4dc8
2016-09-22 04:29:59 +00:00
Jaewan Kim
ba1d8300be DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours
am: 30d1440861

Change-Id: I000e899b41a1a88a2d68a3d554b3d2f6045aa0d2
2016-09-22 04:29:01 +00:00
Jaewan Kim
d1641e8c27 DO NOT MERGE Check caller for sending media key to telephony service
Prevent sending media key events from the non-system app to the
telephony service through the AudioManager.dispatchMediaKeyEvent()
or sending media key broadcast directly.

Bug: 29833954
Tested: Installed malicious apps and confirmed that they don't work.
Tested: Run CtsTelecomTestCases and CtsMediaTestCases
Change-Id: I2a9e78196ba7455324e485f098f095d03b47ee15
2016-09-22 12:53:08 +09:00
Ajay Panicker
8919cc83bb Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f
am: dc0f9fa9c9  -s ours

Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987
2016-09-22 03:50:02 +00:00
Ajay Panicker
f65661939b Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97 am: 94c08c2bed -s ours
am: d4fe288933

Change-Id: Ie0629a3b6f4c5fd8166bb060673606878f00bef8
2016-09-22 03:49:50 +00:00
Ajay Panicker
3d4c737736 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976 am: 9c7ac98157 -s ours
am: 1448a693d8

Change-Id: I8693bc42cd9ff46f6b0c56db49a5c467b3ab4af0
2016-09-22 03:48:56 +00:00
Ajay Panicker
7f84596929 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 786e2694b1 am: 8fd324c33f
am: 438cc52ca1  -s ours

Change-Id: Iabaa5642ffa6c3417b5e027e2da9b33666b1aacf
2016-09-22 03:48:40 +00:00
Jaewan Kim
91ccfa1def Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c am: e47b5adce2
am: bea0b3ec06  -s ours

Change-Id: Ic367544242a4034b66f03568eb7d1035f90836dd
2016-09-22 03:48:37 +00:00
Ajay Panicker
d677e8d413 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9 -s ours
am: a70fffe8e7

Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76
2016-09-22 03:47:58 +00:00
Jaewan Kim
30d1440861 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca
am: 6bf115121c  -s ours

Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
2016-09-22 03:47:42 +00:00
Ajay Panicker
1783182332 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1 am: 8be4dc7e16 -s ours
am: c56c079470

Change-Id: Ie03995ef39bce15b5279ff78ef23e94401eab9db
2016-09-22 03:47:01 +00:00
Jaewan Kim
bea0b3ec06 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev am: 162c80bf0c
am: e47b5adce2

Change-Id: Ie35fa2ebffc5f5369b1473f78c0bfeb38fdfc5ca
2016-09-22 03:23:14 +00:00
Jaewan Kim
6bf115121c DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267
am: 709d112eca

Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253
2016-09-22 03:22:18 +00:00
Jaewan Kim
f7f452fd28 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours
am: 5abd69e59a

Change-Id: I00d1e9f1c7f41f0f15429a159833c8cbaf789342
2016-09-22 02:55:15 +00:00
Jaewan Kim
2d88f87a82 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours
am: 031fb04776

Change-Id: I05beb9fff4527be83812122be9d783c9a109cb01
2016-09-22 02:54:22 +00:00
Kevin Hufnagle
0355128699 docs: Fixed syntax error in "Content URI patterns" code sample
Bug: 31624162
Change-Id: Id1720c3ebb6eff22384a48d8c1a4ed56abde00f4
2016-09-21 19:51:32 -07:00
Elliot Waite
c77b72f244 Merge "Revert fixed at links." into nyc-dev 2016-09-22 02:19:44 +00:00
Ajay Panicker
d4fe288933 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours am: 7cd1668893 am: a5e128ba97
am: 94c08c2bed  -s ours

Change-Id: I92cf4d41b8adae4021b9a2eaf99f56015c995148
2016-09-22 01:37:37 +00:00
Ajay Panicker
1448a693d8 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6 am: 2cf025f976
am: 9c7ac98157  -s ours

Change-Id: I3bc0085154ca14e3bee294de6109e41e1ccd9fa5
2016-09-22 01:36:41 +00:00
Ajay Panicker
a70fffe8e7 Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b
am: 852e5a43b9  -s ours

Change-Id: I2327ac15699e1734d4cf3ae4e1f7e8a5aedc0b5b
2016-09-22 01:35:54 +00:00
Ajay Panicker
c56c079470 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4 am: 46442d1be1
am: 8be4dc7e16  -s ours

Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
2016-09-22 01:34:51 +00:00
Ajay Panicker
2309b98b25 Merge "Remove net_bt_stack group and replace it with bluetooth" 2016-09-22 01:32:33 +00:00
Etan Cohen
78ef40a668 [NAN] Separate ATTACH from IDENTITY_CHANGE callbacks.
Provide separate mechanism to attach with a request for identity
change listener.

(cherry-pick of commit 78e33f277e)

Bug: 31470256
Test: unit tests & integration (sl4a) tests.
Change-Id: I26b3bf4e904f3c3822578185fa55e2de5e63b71b
2016-09-21 18:11:33 -07:00
Adarsh Fernando
dafcbfa693 Removing a temporary redirect for /ndk/guides/cmake.html
Change-Id: I45d9aa20bca3e37c4240601ae75cca24081a63f6
2016-09-21 17:55:31 -07:00
Etan Cohen
dcac00f325 Merge "[NAN] Method renames based on API council feedback" 2016-09-22 00:52:48 +00:00
Elliot Waite
7c70fed347 Revert fixed at links.
This reverts commit c4ae7827e2.

Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
2016-09-21 16:38:02 -07:00
smain@google.com
2f2365de4a add source.properties file to the offline docs build
which is required to get this in the SDK Manager

Change-Id: If53cdedcb8f5910fe37add44168348c9fd14d0cb
2016-09-21 16:26:41 -07:00
Jaewan Kim
bb4697b2f5 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am: 8ba2549592

Change-Id: Ife59e9c42d4c6f5632429764c30fa62b803a97fc
2016-09-21 22:54:59 +00:00
Jaewan Kim
f6272e1fd5 DO NOT MERGE Check caller for sending media key to global priority session
am: 09c3df004b

Change-Id: If41cb6895220d09267fac3e44348e0a4a330ec16
2016-09-21 22:54:50 +00:00
Jaewan Kim
78fa55e261 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am: 22c9458a13

Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
2016-09-21 22:54:02 +00:00
Jaewan Kim
868d586c98 DO NOT MERGE Check caller for sending media key to global priority session
am: c282c4f106

Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
2016-09-21 22:53:58 +00:00
Jaewan Kim
5abd69e59a Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev
am: 64b7b1522e  -s ours

Change-Id: I1aaad42b1a3a82753aca4d55d743116cc3b674bd
2016-09-21 22:53:42 +00:00
Jaewan Kim
031fb04776 DO NOT MERGE Check caller for sending media key to global priority session
am: 4e9af38ec4  -s ours

Change-Id: I416843909b0b49378d8b6dc4eb92032ae7a1418e
2016-09-21 22:53:38 +00:00
Jaewan Kim
e47b5adce2 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
am: 162c80bf0c

Change-Id: Icbabe6e78468cb4138b8cab77ff06432628739c0
2016-09-21 22:53:29 +00:00
Jaewan Kim
709d112eca DO NOT MERGE Check caller for sending media key to global priority session
am: 6a1567c267

Change-Id: Ic2bdd07b94fd9d6bdaa701d3e719904a2f84cc4d
2016-09-21 22:53:17 +00:00
Adarsh Fernando
9af57aa309 Found a couple of more references to Android N.
Bug:31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
2016-09-21 15:45:04 -07:00
Kevin Hufnagle
b6b57d432d docs: Fixed typo in "Query the View Hierarchy" heading title
Bug: 30878639
Change-Id: I7bd7a3a14d388f01df18da674bdb79adadf6da7f
2016-09-21 15:31:21 -07:00
Adarsh Fernando
fe060d3f37 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev 2016-09-21 22:26:51 +00:00
Jaewan Kim
64b7b1522e Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev 2016-09-21 22:21:06 +00:00
Kevin Hufnagle
d24bb252cb docs: Fixed layout of "Build Buzz" page.
Bug: 31652355
Change-Id: I9bd8608a6f4cc94665e4c2689902c7818015fbed
2016-09-21 15:15:14 -07:00