OSDN Git Service
Jaewan Kim [Thu, 22 Sep 2016 12:35:13 +0000 (12:35 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 12:34:18 +0000 (12:34 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 12:33:22 +0000 (12:33 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 12:32:25 +0000 (12:32 +0000)]
[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
Ajay Panicker [Thu, 22 Sep 2016 12:31:06 +0000 (12:31 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 12:29:58 +0000 (12:29 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 12:28:57 +0000 (12:28 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 11:23:35 +0000 (11:23 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth" am:
2309b98b25
am:
4a1fd7eb3d
Change-Id: If1fc5aab977c74c0865e0abc18205eaf028148c7
Jaewan Kim [Thu, 22 Sep 2016 10:58:44 +0000 (10:58 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 10:57:53 +0000 (10:57 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 10:56:50 +0000 (10:56 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 10:55:43 +0000 (10:55 +0000)]
[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
Ajay Panicker [Thu, 22 Sep 2016 10:54:53 +0000 (10:54 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 10:53:39 +0000 (10:53 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 10:52:37 +0000 (10:52 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 09:17:14 +0000 (09:17 +0000)]
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
Elliot Waite [Thu, 22 Sep 2016 09:16:04 +0000 (09:16 +0000)]
Merge "Revert fixed at links." into nyc-dev
am:
c77b72f244
Change-Id: Ia28b1f02a83cd8f0e346e559bb47a4e0b885fbf2
Elliot Waite [Thu, 22 Sep 2016 09:15:59 +0000 (09:15 +0000)]
Revert fixed at links.
am:
7c70fed347
Change-Id: I6ff2d18d5cfb834d32e80c945dd14e09c1cdf1de
Adarsh Fernando [Thu, 22 Sep 2016 09:15:08 +0000 (09:15 +0000)]
Found a couple of more references to Android N.
am:
9af57aa309
Change-Id: I9f24e1da25553e1d50f61a0aa7a4398f39321174
Jaewan Kim [Thu, 22 Sep 2016 09:14:33 +0000 (09:14 +0000)]
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
Adarsh Fernando [Thu, 22 Sep 2016 09:13:40 +0000 (09:13 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
am:
fe060d3f37
Change-Id: Ifc20898208dae803037a3c322bea785e6d82926e
Adarsh Fernando [Thu, 22 Sep 2016 09:13:33 +0000 (09:13 +0000)]
Docs: Cleanup of Preview language in Android 7.0 docs.
am:
4b6d939321
Change-Id: Ic43b45e9076fa5f132178a5c2a7edbd47f3f8f3f
Jaewan Kim [Thu, 22 Sep 2016 09:13:26 +0000 (09:13 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 08:09:21 +0000 (08:09 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
am:
2309b98b25
Change-Id: Ib2704e71c9d32a5799b44d1753bf3011607787c8
Jaewan Kim [Thu, 22 Sep 2016 08:08:16 +0000 (08:08 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 08:07:35 +0000 (08:07 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 08:07:15 +0000 (08:07 +0000)]
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
Etan Cohen [Thu, 22 Sep 2016 07:45:51 +0000 (07:45 +0000)]
Merge "[NAN] Method renames based on API council feedback" am:
dcac00f325
am:
3501748dea
Change-Id: I2b39ff45bcdbd29228720c2abc10a59d1f0480c1
Ajay Panicker [Thu, 22 Sep 2016 07:39:22 +0000 (07:39 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 07:38:34 +0000 (07:38 +0000)]
[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
Ajay Panicker [Thu, 22 Sep 2016 07:37:44 +0000 (07:37 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 07:36:50 +0000 (07:36 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 07:35:45 +0000 (07:35 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 07:34:55 +0000 (07:34 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106 am:
868d586c98
am:
ff1c1993b7
Change-Id: I60355987ea0814314c2f79041d068e099b158c7b
Ajay Panicker [Thu, 22 Sep 2016 04:58:44 +0000 (04:58 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 04:57:53 +0000 (04:57 +0000)]
[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
Ajay Panicker [Thu, 22 Sep 2016 04:57:01 +0000 (04:57 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 04:56:04 +0000 (04:56 +0000)]
[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
Etan Cohen [Thu, 22 Sep 2016 04:55:21 +0000 (04:55 +0000)]
Merge "[NAN] Method renames based on API council feedback"
am:
dcac00f325
Change-Id: I1eaa81952e2826f25de9e3e9f4edfa23db368f5a
Jaewan Kim [Thu, 22 Sep 2016 04:55:18 +0000 (04:55 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev am:
22c9458a13
am:
78fa55e261
Change-Id: I81587010e753fd1f23a530c973675fe0790b8b33
Jaewan Kim [Thu, 22 Sep 2016 04:54:25 +0000 (04:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
c282c4f106
am:
868d586c98
Change-Id: Icc7c4e12e75f5b27c41866fcb8d8553fcffd90ab
Jaewan Kim [Thu, 22 Sep 2016 04:29:59 +0000 (04:29 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 04:29:01 +0000 (04:29 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 03:49:50 +0000 (03:49 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 03:48:56 +0000 (03:48 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 03:48:37 +0000 (03:48 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 03:47:58 +0000 (03:47 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 03:47:42 +0000 (03:47 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267 am:
709d112eca
am:
6bf115121c -s ours
Change-Id: Ic25670f851a72e8be2b028016ac4515c8977d349
Ajay Panicker [Thu, 22 Sep 2016 03:47:01 +0000 (03:47 +0000)]
[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
Jaewan Kim [Thu, 22 Sep 2016 03:23:14 +0000 (03:23 +0000)]
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
Jaewan Kim [Thu, 22 Sep 2016 03:22:18 +0000 (03:22 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session am:
6a1567c267
am:
709d112eca
Change-Id: Ic112856078e6b3c0bd4e6e2442457c3be035a253
Elliot Waite [Thu, 22 Sep 2016 02:19:41 +0000 (02:19 +0000)]
Merge "Revert fixed at links." into nyc-dev
Ajay Panicker [Thu, 22 Sep 2016 01:37:37 +0000 (01:37 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 01:36:41 +0000 (01:36 +0000)]
[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
Ajay Panicker [Thu, 22 Sep 2016 01:35:54 +0000 (01:35 +0000)]
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
Ajay Panicker [Thu, 22 Sep 2016 01:34:51 +0000 (01:34 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4 am:
46442d1be1
am:
8be4dc7e16 -s ours
Change-Id: Ic7a46031556a3ae24d8f56808c0b9c631cf931a4
Ajay Panicker [Thu, 22 Sep 2016 01:32:33 +0000 (01:32 +0000)]
Merge "Remove net_bt_stack group and replace it with bluetooth"
Etan Cohen [Thu, 22 Sep 2016 00:52:47 +0000 (00:52 +0000)]
Merge "[NAN] Method renames based on API council feedback"
Elliot Waite [Wed, 21 Sep 2016 22:47:30 +0000 (15:47 -0700)]
Revert fixed at links.
This reverts commit
c4ae7827e26ab3d0ac340d896c28c166da860fdb.
Change-Id: I65729721ced7fc04d0b9691b63520007adddee29
Jaewan Kim [Wed, 21 Sep 2016 22:54:59 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
am:
8ba2549592
Change-Id: Ife59e9c42d4c6f5632429764c30fa62b803a97fc
Jaewan Kim [Wed, 21 Sep 2016 22:54:50 +0000 (22:54 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
09c3df004b
Change-Id: If41cb6895220d09267fac3e44348e0a4a330ec16
Jaewan Kim [Wed, 21 Sep 2016 22:54:02 +0000 (22:54 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
am:
22c9458a13
Change-Id: Ie3279270215a99f9b7f98dc6325f4cc7c431cc9b
Jaewan Kim [Wed, 21 Sep 2016 22:53:58 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
c282c4f106
Change-Id: I8ec1e339f50ab7d017bcf91cddefc2b0f569c696
Jaewan Kim [Wed, 21 Sep 2016 22:53:29 +0000 (22:53 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
am:
162c80bf0c
Change-Id: Icbabe6e78468cb4138b8cab77ff06432628739c0
Jaewan Kim [Wed, 21 Sep 2016 22:53:17 +0000 (22:53 +0000)]
DO NOT MERGE Check caller for sending media key to global priority session
am:
6a1567c267
Change-Id: Ic2bdd07b94fd9d6bdaa701d3e719904a2f84cc4d
Adarsh Fernando [Wed, 21 Sep 2016 22:45:04 +0000 (15:45 -0700)]
Found a couple of more references to Android N.
Bug:
31647521
Change-Id: I9f8c40e43cb79656761f237a0f144ab8a9b4c5d5
Adarsh Fernando [Wed, 21 Sep 2016 22:26:48 +0000 (22:26 +0000)]
Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev
Greg Hackmann [Wed, 21 Sep 2016 22:01:19 +0000 (22:01 +0000)]
Merge changes Iaa153fca,I619e2d8a am:
59acc059a6
am:
4a62720f47
Change-Id: I5bd454c71267e673b000f2a2b76ffcb66ec432e9
Greg Hackmann [Wed, 21 Sep 2016 21:59:07 +0000 (21:59 +0000)]
AlarmManagerService: explain some timerfd_create() failures am:
a0126e0857
am:
dd4f59a76f
Change-Id: I79bf671f247fc4a61e2eeb4262de716611324a51
Adarsh Fernando [Wed, 21 Sep 2016 20:56:37 +0000 (13:56 -0700)]
Docs: Cleanup of Preview language in Android 7.0 docs.
bug:
31647521
Change-Id: I882f7d7cb5bb1ddcc18ddbc29b17edbbbd84131a
Ajay Panicker [Wed, 21 Sep 2016 21:58:43 +0000 (21:58 +0000)]
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
Change-Id: Ibfdcd322fef7b589e6e6c14f25fb92b8b7ed43a1
Ajay Panicker [Wed, 21 Sep 2016 21:57:48 +0000 (21:57 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours am:
57fdbb97a6
am:
2cf025f976
Change-Id: Id5edc69b9594289566590d869ad0b4c0219fb242
Greg Hackmann [Wed, 21 Sep 2016 21:57:37 +0000 (21:57 +0000)]
AlarmManagerService: remove legacy /dev/alarm support am:
d7151c06f1
am:
ccafcac745
Change-Id: I6589c292fd7f850acf7c7acd27b7cf00fe762416
Ajay Panicker [Wed, 21 Sep 2016 21:56:51 +0000 (21:56 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am:
447ac4b31d
am:
4431d6cb5b
Change-Id: Ieeff1ea88cfef281c3ebf42312261a601c18e59d
Ajay Panicker [Wed, 21 Sep 2016 21:55:52 +0000 (21:55 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
85bc33a8f4
am:
46442d1be1
Change-Id: I50616eafb788247b103911bd5ac899899e3ba47c
TreeHugger Robot [Wed, 21 Sep 2016 21:47:00 +0000 (21:47 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:51 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
TreeHugger Robot [Wed, 21 Sep 2016 21:46:41 +0000 (21:46 +0000)]
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
Ajay Panicker [Wed, 21 Sep 2016 21:31:00 +0000 (21:31 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am:
f78ff48d0d -s ours
am:
7cd1668893
Change-Id: Ibe7158ab142e8c566b05dc370c77393231f1f507
Ajay Panicker [Wed, 21 Sep 2016 21:30:13 +0000 (21:30 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am:
27b3d578b9 -s ours
am:
57fdbb97a6
Change-Id: I73e6ebd27ecabc7510ef9661eb1fcacdb2bafccf
Ajay Panicker [Wed, 21 Sep 2016 21:15:40 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
am:
f78ff48d0d -s ours
Change-Id: I82e447c8dbbabd40977805bc1d233de832296e6b
Ajay Panicker [Wed, 21 Sep 2016 21:15:37 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
27b3d578b9 -s ours
Change-Id: Ia29f66f121813b3e03a16a665f7bdae2d75ed09b
Ajay Panicker [Wed, 21 Sep 2016 21:15:35 +0000 (21:15 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
am:
447ac4b31d
Change-Id: I939008cb6b770c4273e258d91e2916a1823ec6fb
Ajay Panicker [Wed, 21 Sep 2016 21:15:32 +0000 (21:15 +0000)]
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
am:
85bc33a8f4
Change-Id: I2194d4c01e8bff53a7d6fcdf25513b216a511155
Greg Hackmann [Wed, 21 Sep 2016 21:15:30 +0000 (21:15 +0000)]
Merge changes Iaa153fca,I619e2d8a
am:
59acc059a6
Change-Id: Ic657c33aa5fd728d0e5a8fc3c6c23c0fff420844
Greg Hackmann [Wed, 21 Sep 2016 21:15:13 +0000 (21:15 +0000)]
AlarmManagerService: explain some timerfd_create() failures
am:
a0126e0857
Change-Id: I7c9e394d2edcca81e757e351f9de25447b33c2f4
Greg Hackmann [Wed, 21 Sep 2016 21:13:56 +0000 (21:13 +0000)]
AlarmManagerService: remove legacy /dev/alarm support
am:
d7151c06f1
Change-Id: Ibefee7970e426f69e62b9f31fb7a38d24ad63c2a
Ajay Panicker [Wed, 21 Sep 2016 21:08:07 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
Ajay Panicker [Wed, 21 Sep 2016 21:08:04 +0000 (21:08 +0000)]
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
Greg Hackmann [Wed, 21 Sep 2016 21:04:09 +0000 (21:04 +0000)]
Merge changes Iaa153fca,I619e2d8a
* changes:
AlarmManagerService: explain some timerfd_create() failures
AlarmManagerService: remove legacy /dev/alarm support
Andre Eisenbach [Wed, 21 Sep 2016 20:57:33 +0000 (20:57 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected" am:
e2d9cc4bc9
am:
c1777a853c
Change-Id: I4b953e164c4d77342d63e4a59502e4997a5a04c9
Andre Eisenbach [Wed, 21 Sep 2016 20:51:07 +0000 (20:51 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
am:
e2d9cc4bc9
Change-Id: I7e83f318b9a8ab0520d4df66d9faa96e768df612
Etan Cohen [Tue, 20 Sep 2016 16:23:33 +0000 (09:23 -0700)]
[NAN] Method renames based on API council feedback
- Fix tenses throughout
- connect -> attach
- disconnect/terminate -> destroy
- IsUsable -> IsAvailable
Note: pure rename operation - no functional changes
(cherry-pick of commit
34a0342ab515762f3fc594ffbc4784e56e79ccbf)
Bug:
31470256
Test: unit tests + integration (sl4a) test
Change-Id: I0f275c590c63109b7196622cfc5001082e3eb5a2
Chris Tate [Wed, 21 Sep 2016 20:39:56 +0000 (20:39 +0000)]
Merge "Fix WallpaperManager APIs" am:
73e89cd290
am:
6e1400f43f
Change-Id: I1b220d887daefe160472fb41959a03eb20e1b98e
Andre Eisenbach [Wed, 21 Sep 2016 20:38:31 +0000 (20:38 +0000)]
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
Chris Tate [Wed, 21 Sep 2016 20:34:49 +0000 (20:34 +0000)]
Merge "Fix WallpaperManager APIs"
am:
73e89cd290
Change-Id: I6dd139e8ccb71e6c64141733f9de031b20694179
Etan Cohen [Wed, 21 Sep 2016 20:27:06 +0000 (20:27 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am:
84b3d2040a
am:
337baf9d42
Change-Id: I9163d5c6f37ba32ad3ee076b345b89d44d96275f
Chris Tate [Wed, 21 Sep 2016 20:26:00 +0000 (20:26 +0000)]
Merge "Fix WallpaperManager APIs"
Etan Cohen [Wed, 21 Sep 2016 20:21:25 +0000 (20:21 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
am:
84b3d2040a
Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce
Etan Cohen [Wed, 21 Sep 2016 20:14:13 +0000 (20:14 +0000)]
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
OSDN Git Service
