Commit Graph

254417 Commits

Author SHA1 Message Date
Ajay Panicker
553961fbcc [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 am: f6d8037708 am: 90eafb5322 -s ours
am: b2a1dcb913

Change-Id: I420198b83b2b8480a87a6d55195b6f05ec06b057
2016-09-22 12:32:25 +00:00
Ajay Panicker
fe3e7b181b 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 am: 73607db5a1 am: 05cd9942d9 -s ours
am: 745254f98b

Change-Id: I8204d26ad589a600a7e1cccc306266b1ab579c6a
2016-09-22 12:31:06 +00:00
Ajay Panicker
5732e9dbc3 [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 am: 993015ce9a am: 8e172c638d -s ours
am: 9338ffa148

Change-Id: Iad6b7ac69088d60cf02cd9870e2520388d398767
2016-09-22 12:29:58 +00:00
Jaewan Kim
c17a43fcfd Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102 am: 5decf8e715 -s ours
am: 963c269ffa

Change-Id: I709f55ff1694415af29f11694d74c1564dbe36fc
2016-09-22 12:28:57 +00:00
Ajay Panicker
bd25fec0d9 Merge "Remove net_bt_stack group and replace it with bluetooth" am: 2309b98b25
am: 4a1fd7eb3d

Change-Id: If1fc5aab977c74c0865e0abc18205eaf028148c7
2016-09-22 11:23:35 +00:00
Ajay Panicker
b2a1dcb913 [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 am: f6d8037708
am: 90eafb5322  -s ours

Change-Id: I21edab5680d1cc4f5afa74ab9764f0ff945a44cc
2016-09-22 10:55:43 +00:00
Ajay Panicker
745254f98b 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 am: 73607db5a1
am: 05cd9942d9  -s ours

Change-Id: Iedd8920de15034413968efa125fa544b5a25e87c
2016-09-22 10:54:53 +00:00
Ajay Panicker
9338ffa148 [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 am: 993015ce9a
am: 8e172c638d  -s ours

Change-Id: I6ed9ac6f79a853f08fbc3105cade0d47033701f0
2016-09-22 10:53:39 +00:00
Jaewan Kim
963c269ffa Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261 am: b2403f3102
am: 5decf8e715  -s ours

Change-Id: I79036440c10f32b4a30fbefa3a3ff65ebd9fc69e
2016-09-22 10:52:37 +00:00
Jaewan Kim
aff8ee6351 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7 am: 35e95d82d7 -s ours
am: 2ccdbce954

Change-Id: I69d1c836247dbe40ff7c07e503a4cfbd324ecd55
2016-09-22 09:17:14 +00:00
Elliot Waite
ed870fccb4 Merge "Revert fixed at links." into nyc-dev
am: c77b72f244

Change-Id: Ia28b1f02a83cd8f0e346e559bb47a4e0b885fbf2
2016-09-22 09:16:04 +00:00
Elliot Waite
ef69678105 Revert fixed at links.
am: 7c70fed347

Change-Id: I6ff2d18d5cfb834d32e80c945dd14e09c1cdf1de
2016-09-22 09:15:59 +00:00
Adarsh Fernando
4c9ecfbd01 Found a couple of more references to Android N.
am: 9af57aa309

Change-Id: I9f24e1da25553e1d50f61a0aa7a4398f39321174
2016-09-22 09:15:08 +00:00
Adarsh Fernando
df9659a112 Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am: fe060d3f37

Change-Id: Ifc20898208dae803037a3c322bea785e6d82926e
2016-09-22 09:13:40 +00:00
Adarsh Fernando
ce73af6cd2 Docs: Cleanup of Preview language in Android 7.0 docs.
am: 4b6d939321

Change-Id: Ic43b45e9076fa5f132178a5c2a7edbd47f3f8f3f
2016-09-22 09:13:33 +00:00
Ajay Panicker
4a1fd7eb3d Merge "Remove net_bt_stack group and replace it with bluetooth"
am: 2309b98b25

Change-Id: Ib2704e71c9d32a5799b44d1753bf3011607787c8
2016-09-22 08:09:21 +00:00
Jaewan Kim
2ccdbce954 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98 am: ff1c1993b7
am: 35e95d82d7  -s ours

Change-Id: I5fe98000c623199706bd3879a361ef72e0da2ccb
2016-09-22 08:07:35 +00:00
Etan Cohen
6b6c719dd2 Merge "[NAN] Method renames based on API council feedback" am: dcac00f325
am: 3501748dea

Change-Id: I2b39ff45bcdbd29228720c2abc10a59d1f0480c1
2016-09-22 07:45:51 +00:00
Ajay Panicker
90eafb5322 [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
am: f6d8037708

Change-Id: Iec857815b52d8b0bdfdd1b14210fa67bc3a17c83
2016-09-22 07:38:34 +00:00
Ajay Panicker
05cd9942d9 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
am: 73607db5a1

Change-Id: I0fbfd3aac6e4d6e6090bfcde65abc8f5641cfe5e
2016-09-22 07:37:44 +00:00
Ajay Panicker
8e172c638d [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
am: 993015ce9a

Change-Id: I19514d41db780f41114fe05e86360beeda44352b
2016-09-22 07:36:50 +00:00
Jaewan Kim
5decf8e715 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am: 22c9458a13 am: 78fa55e261
am: b2403f3102

Change-Id: Ia418a5eb08b7f5cdb2a987c4f17708069012c0e5
2016-09-22 07:35:45 +00:00
Jaewan Kim
35e95d82d7 DO NOT MERGE Check caller for sending media key to global priority session am: c282c4f106 am: 868d586c98
am: ff1c1993b7

Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
2016-09-22 07:34:55 +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
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
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
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
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
Elliot Waite
c77b72f244 Merge "Revert fixed at links." into nyc-dev 2016-09-22 02:19:44 +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
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
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
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
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
Greg Hackmann
cd5087a5d0 Merge changes Iaa153fca,I619e2d8a am: 59acc059a6
am: 4a62720f47

Change-Id: I5bd454c71267e673b000f2a2b76ffcb66ec432e9
2016-09-21 22:01:19 +00:00
Greg Hackmann
b79eb2540a AlarmManagerService: explain some timerfd_create() failures am: a0126e0857
am: dd4f59a76f

Change-Id: I79bf671f247fc4a61e2eeb4262de716611324a51
2016-09-21 21:59:07 +00:00
Adarsh Fernando
4b6d939321 Docs: Cleanup of Preview language in Android 7.0 docs.
bug:31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
2016-09-21 21:58:46 +00:00
Ajay Panicker
9c7ac98157 [DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours am: 57fdbb97a6
am: 2cf025f976

Change-Id: Id5edc69b9594289566590d869ad0b4c0219fb242
2016-09-21 21:57:48 +00:00
Greg Hackmann
d869532332 AlarmManagerService: remove legacy /dev/alarm support am: d7151c06f1
am: ccafcac745

Change-Id: I6589c292fd7f850acf7c7acd27b7cf00fe762416
2016-09-21 21:57:37 +00:00