Commit Graph

254465 Commits

Author SHA1 Message Date
Jaewan Kim
d4167d7a0b Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0 am: a13096f4c5 -s ours
am: 36aa253b2b

Change-Id: I157f952036a5ee185878c883883c65a1011bcabf
2016-09-22 12:37:05 +00:00
Jaewan Kim
e9bb43ff8e DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5 am: 9632afe809 -s ours
am: b96d410537

Change-Id: I9bad8dac7cca960aa1b0f4ce4764108a927d0370
2016-09-22 12:36:11 +00:00
Jaewan Kim
8c53db264a 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 am: 4167620d33 am: 2c9ad0ff81 am: b6d6519e34 -s ours
am: 61fda61d20

Change-Id: If9db6d86109457a4ab06b69eb7c1db35ef823127
2016-09-22 12:35:13 +00:00
Jaewan Kim
6f6b07c9c7 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993 am: 1adff2ee05 -s ours
am: 78efad6418

Change-Id: Ibd5a21d2c5fd91ec9623c48e138aba61be373b23
2016-09-22 12:34:18 +00:00
Ajay Panicker
7b348ecc95 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 am: 630d577349 am: c9830d56e5 -s ours
am: c5442c263a

Change-Id: I478f37a9e43feda3ca5a6657ab66a7549e11c2c8
2016-09-22 12:33:22 +00:00
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
Jaewan Kim
36aa253b2b Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf am: 8cb7a9fdb0
am: a13096f4c5  -s ours

Change-Id: I5b9a7bb6faae813c9b4f6beeb8f96dfb5ad3cc3b
2016-09-22 11:22:51 +00:00
Jaewan Kim
b96d410537 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff am: e1e6f0a7f5
am: 9632afe809  -s ours

Change-Id: I68e31867b8c925717eda87a426add614f731f77a
2016-09-22 10:59:39 +00:00
Jaewan Kim
61fda61d20 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 am: 4167620d33 am: 2c9ad0ff81
am: b6d6519e34  -s ours

Change-Id: Idda087e0cbccf3e94dd23a41156cdcc14a4b2459
2016-09-22 10:58:44 +00:00
Jaewan Kim
78efad6418 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be am: 016d110993
am: 1adff2ee05  -s ours

Change-Id: I99f14369c3f5f4388a17b85720a45bde8ee4c5be
2016-09-22 10:57:53 +00:00
Ajay Panicker
c5442c263a 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 am: 630d577349
am: c9830d56e5  -s ours

Change-Id: Iaae899eeea3c9c95ebcd7654e6fb5a89d7f1ed90
2016-09-22 10:56:50 +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
a13096f4c5 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5 am: d9e8bfb8cf
am: 8cb7a9fdb0

Change-Id: Ib54fc420bb43c312f72f5c72bb38b97550db9da9
2016-09-22 10:52:34 +00:00
Jaewan Kim
9632afe809 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5 am: f595add2ff
am: e1e6f0a7f5

Change-Id: I373b66ee022f14d331729531c450eb18f8572d9b
2016-09-22 09:38:13 +00:00
Jaewan Kim
8cb7a9fdb0 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours am: 298c104ae5
am: d9e8bfb8cf

Change-Id: I3f09cc3c507244d1999ed280002e1354d25db9d2
2016-09-22 09:37:34 +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
Jaewan Kim
b6d6519e34 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 am: 4167620d33
am: 2c9ad0ff81

Change-Id: I57e8a4e6b415683cba317afa012880b8ac12bff6
2016-09-22 09:14:33 +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
Jaewan Kim
1adff2ee05 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861 am: ba1d8300be
am: 016d110993

Change-Id: I6a216c2e2ddb6b9959e9691c5014c0d29b6c453d
2016-09-22 09:13:26 +00:00
Jaewan Kim
e1e6f0a7f5 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours am: 8d14f464b5
am: f595add2ff

Change-Id: I9d7b96411a566e6fa4ad4c8d263140245b427b44
2016-09-22 09:13:16 +00:00
Jaewan Kim
d9e8bfb8cf Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28 am: 8a168a7c5d -s ours
am: 298c104ae5

Change-Id: Id2538e101907fe6a3dc5cb284ecf93a392a047ba
2016-09-22 08:45:58 +00:00
Jaewan Kim
f595add2ff DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82 am: 64110c6bf1 -s ours
am: 8d14f464b5

Change-Id: Id6f3783a23706efaa7f389deb84e69c69fab501a
2016-09-22 08:45:03 +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
2c9ad0ff81 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
am: 4167620d33

Change-Id: I1af888ef60ff3920e1b63a421e432319bdefdb3e
2016-09-22 08:08:16 +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
Jaewan Kim
016d110993 DO NOT MERGE Check caller for sending media key to global priority session am: 6a1567c267 am: 709d112eca am: 6bf115121c -s ours am: 30d1440861
am: ba1d8300be

Change-Id: I198e4b87bed7f0b4e253e86a89fa5c36fec1fbb2
2016-09-22 08:07:15 +00:00
Jaewan Kim
298c104ae5 Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a am: f7f452fd28
am: 8a168a7c5d  -s ours

Change-Id: Ib4a702bd653ca1083ac4846ac4a6947ef91e2e33
2016-09-22 08:06:16 +00:00
Jaewan Kim
8d14f464b5 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776 am: 2d88f87a82
am: 64110c6bf1  -s ours

Change-Id: I69062cb6535df22a743270a62fda89dcca155e87
2016-09-22 08:05:11 +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
c9830d56e5 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
am: 630d577349

Change-Id: I812cd00912fad74e9f07a6881bec4b93e6e71490
2016-09-22 07:39:22 +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
Jaewan Kim
8a168a7c5d Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-dev am: 64b7b1522e -s ours am: 5abd69e59a
am: f7f452fd28

Change-Id: Iaceb27058be8f06e2e1b0a115ba914f7b0aad7e4
2016-09-22 06:41:03 +00:00
Jaewan Kim
64110c6bf1 DO NOT MERGE Check caller for sending media key to global priority session am: 4e9af38ec4 -s ours am: 031fb04776
am: 2d88f87a82

Change-Id: Idd9cdf4bb14b4feced73ea176f3505ae02d630e7
2016-09-22 06:40:05 +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