Greg Hackmann
cd5087a5d0
Merge changes Iaa153fca,I619e2d8a am: 59acc059a6
...
am: 4a62720f47
2016-09-21 22:01:19 +00:00
Greg Hackmann
b79eb2540a
AlarmManagerService: explain some timerfd_create() failures am: a0126e0857
...
am: dd4f59a76f
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
94c08c2bed
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
2016-09-21 21:58:43 +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
2016-09-21 21:57:48 +00:00
Greg Hackmann
d869532332
AlarmManagerService: remove legacy /dev/alarm support am: d7151c06f1
...
am: ccafcac745
2016-09-21 21:57:37 +00:00
Ajay Panicker
852e5a43b9
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d
...
am: 4431d6cb5b
2016-09-21 21:56:51 +00:00
Ajay Panicker
dc0f9fa9c9
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4
...
am: 35d1b45b0f
2016-09-21 21:56:49 +00:00
Ajay Panicker
8be4dc7e16
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 85bc33a8f4
...
am: 46442d1be1
2016-09-21 21:55:52 +00:00
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
TreeHugger Robot
22c9458a13
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into mnc-dev
2016-09-21 21:47:02 +00:00
TreeHugger Robot
162c80bf0c
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into lmp-mr1-dev
2016-09-21 21:46:53 +00:00
TreeHugger Robot
8ba2549592
Merge "DO NOT MERGE Check caller for sending media key to global priority session" into nyc-dev
2016-09-21 21:46:43 +00:00
Ajay Panicker
a5e128ba97
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev am: f78ff48d0d -s ours
...
am: 7cd1668893
2016-09-21 21:31:00 +00:00
Ajay Panicker
2cf025f976
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 27b3d578b9 -s ours
...
am: 57fdbb97a6
2016-09-21 21:30:13 +00:00
Kevin Hufnagle
92fd1f0547
docs: Fix for clarification fo location permissions, hardware
...
Bug: 28052540
Change-Id: I88ce44f19085f0c41177c22768e1b3a6c0e869da
2016-09-21 14:16:47 -07:00
Ajay Panicker
35d1b45b0f
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
...
am: c119a677c4
2016-09-21 21:15:59 +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
7cd1668893
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
...
am: f78ff48d0d
2016-09-21 21:15:40 +00:00
Ajay Panicker
57fdbb97a6
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
...
am: 27b3d578b9
2016-09-21 21:15:37 +00:00
Ajay Panicker
4431d6cb5b
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
...
am: 447ac4b31d
2016-09-21 21:15:35 +00:00
Ajay Panicker
46442d1be1
[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed
...
am: 85bc33a8f4
2016-09-21 21:15:32 +00:00
Greg Hackmann
4a62720f47
Merge changes Iaa153fca,I619e2d8a
...
am: 59acc059a6
2016-09-21 21:15:30 +00:00
Greg Hackmann
dd4f59a76f
AlarmManagerService: explain some timerfd_create() failures
...
am: a0126e0857
2016-09-21 21:15:13 +00:00
Greg Hackmann
ccafcac745
AlarmManagerService: remove legacy /dev/alarm support
...
am: d7151c06f1
2016-09-21 21:13:56 +00:00
Ajay Panicker
447ac4b31d
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev
2016-09-21 21:08:10 +00:00
Ajay Panicker
f78ff48d0d
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-dev
2016-09-21 21:08:07 +00:00
Ajay Panicker
c119a677c4
Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev
2016-09-21 21:08:04 +00:00
Josh Horwich
999fe148e4
Docs: Fix missing space
...
A space got lost when this document got edited recently, this
simply puts it back.
Bug: None
Test: None
Change-Id: I87ee55322d90f6113c3611050d5f5ce1a43bdccb
2016-09-21 14:04:43 -07:00
Greg Hackmann
59acc059a6
Merge changes Iaa153fca,I619e2d8a
...
* changes:
AlarmManagerService: explain some timerfd_create() failures
AlarmManagerService: remove legacy /dev/alarm support
2016-09-21 21:04:09 +00:00
Andre Eisenbach
7b9a3d7134
Merge "List btopp.intent.action.ACCEPT broadcast as protected" am: e2d9cc4bc9
...
am: c1777a853c
2016-09-21 20:57:33 +00:00
Andre Eisenbach
c1777a853c
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
...
am: e2d9cc4bc9
2016-09-21 20:51:07 +00:00
Etan Cohen
b68ed2876c
[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 34a0342ab5
2016-09-21 13:46:21 -07:00
Chris Tate
2cc80a362a
Merge "Fix WallpaperManager APIs" am: 73e89cd290
...
am: 6e1400f43f
2016-09-21 20:39:56 +00:00
Andre Eisenbach
e2d9cc4bc9
Merge "List btopp.intent.action.ACCEPT broadcast as protected"
2016-09-21 20:38:32 +00:00
Chris Tate
6e1400f43f
Merge "Fix WallpaperManager APIs"
...
am: 73e89cd290
2016-09-21 20:34:49 +00:00
Etan Cohen
ebe497e40b
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a
...
am: 337baf9d42
2016-09-21 20:27:06 +00:00
Chris Tate
73e89cd290
Merge "Fix WallpaperManager APIs"
2016-09-21 20:26:01 +00:00
Etan Cohen
337baf9d42
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
...
am: 84b3d2040a
2016-09-21 20:21:25 +00:00
Etan Cohen
84b3d2040a
Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect."
2016-09-21 20:14:13 +00:00
Andre Eisenbach
4ceb8fe4b1
Merge "Protect REFRESH_BATCHED_SCAN broadcast" am: 6eb62f8ee3
...
am: 9271f57c34
2016-09-21 17:55:24 +00:00
Etan Cohen
bd4bf35d22
[NAN] Refactor WifiNanManager to create separate sessions per connect.
...
Separate session enables separate namespace for functions which depend
on a connection to exist.
(cherry-pick of commit a2eb21d123
2016-09-21 10:54:42 -07:00
Jack He
c82a4f4192
List btopp.intent.action.ACCEPT broadcast as protected
...
Bug: 31604112
Test: manual
Change-Id: Ic5ee837bb895fc5b39b6d1abdd91d8f1d33f62ae
2016-09-21 10:51:47 -07:00
Andre Eisenbach
9271f57c34
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
...
am: 6eb62f8ee3
2016-09-21 17:49:45 +00:00
Andre Eisenbach
6eb62f8ee3
Merge "Protect REFRESH_BATCHED_SCAN broadcast"
2016-09-21 17:38:48 +00:00
Ajay Panicker
707b68c426
Protect REFRESH_BATCHED_SCAN broadcast
...
Bug: 29754520
Test: cherry-pick from internal tree
Change-Id: Id3f43d36db2c5f026a5d3a94e7370051d2e23e37
(cherry picked from commit 58dd0cd65e
2016-09-21 17:38:08 +00:00
Neil Fuller
8ed37211bd
Merge "Track API changes associated with AbstractMethod refactoring" am: 117ef7eb9d
...
am: 3fa8bc066b
2016-09-21 16:28:46 +00:00
Neil Fuller
3fa8bc066b
Merge "Track API changes associated with AbstractMethod refactoring"
...
am: 117ef7eb9d
2016-09-21 16:18:36 +00:00
Neil Fuller
117ef7eb9d
Merge "Track API changes associated with AbstractMethod refactoring"
2016-09-21 16:01:56 +00:00
Fan Zhang
a2d2f7339b
Merge "Fix NPE for WifiConfiguration in AccessPoint." into nyc-dev
...
am: 32bd448cc1
2016-09-21 15:38:27 +00:00
