Dan Willemsen
d377004c98
Merge \\\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\\" am: 5d420e791b am: bdd01e86a5
...
am: a5b9b8f452
2016-07-09 06:08:40 +00:00
Dan Willemsen
a5b9b8f452
Merge \\"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\\" am: 5d420e791b
...
am: bdd01e86a5
2016-07-09 06:05:52 +00:00
Dan Willemsen
bdd01e86a5
Merge \"Use BOARD_USES_VENDORIMAGE to detect vendor image presence\"
...
am: 5d420e791b
2016-07-09 06:03:09 +00:00
Dan Willemsen
5d420e791b
Merge "Use BOARD_USES_VENDORIMAGE to detect vendor image presence"
2016-07-09 05:57:55 +00:00
Erik Kline
48b1eec502
Add UIDs for system DNS and tethering DNS
...
am: 3c2e2f4d5e
2016-07-09 05:43:07 +00:00
Dan Willemsen
0790431f75
Use BOARD_USES_VENDORIMAGE to detect vendor image presence
...
When building without vendor/... in the tree, we won't be creating a
vendorimage, so BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE won't be defined. But
we still need to use the vendor image that will be present.
Bug: 30040825
Change-Id: I756adc615aea11da60da4d3a4568caca9fed93ab
2016-07-08 18:17:48 -07:00
Daniel Rosenberg
479c280e58
Merge "resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp" into nyc-mr1-dev-plus-aosp
2016-07-08 18:24:26 +00:00
Elliott Hughes
6605b0b23a
Merge \\\"Make klog_fd thread-safe and make klog_init a no-op.\\\" am: 588b770063 am: 73d363bbc1
...
am: 7288ac3982
2016-07-08 17:12:48 +00:00
Elliott Hughes
7288ac3982
Merge \\"Make klog_fd thread-safe and make klog_init a no-op.\\" am: 588b770063
...
am: 73d363bbc1
2016-07-08 17:09:08 +00:00
Elliott Hughes
73d363bbc1
Merge \"Make klog_fd thread-safe and make klog_init a no-op.\"
...
am: 588b770063
2016-07-08 17:05:25 +00:00
Elliott Hughes
588b770063
Merge "Make klog_fd thread-safe and make klog_init a no-op."
2016-07-08 17:01:13 +00:00
Erik Kline
5f7ecd953a
Merge \\\"Add UIDs for system DNS and tethering DNS\\\" am: c4dc4f3fc2 am: fcf3ed51dc
...
am: 9f31416013
2016-07-08 08:55:14 +00:00
Erik Kline
9f31416013
Merge \\"Add UIDs for system DNS and tethering DNS\\" am: c4dc4f3fc2
...
am: fcf3ed51dc
2016-07-08 08:51:43 +00:00
Erik Kline
3c2e2f4d5e
Add UIDs for system DNS and tethering DNS
...
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
(cherry picked from commit d63cf7d85a
2016-07-08 17:49:40 +09:00
Erik Kline
fcf3ed51dc
Merge \"Add UIDs for system DNS and tethering DNS\"
...
am: c4dc4f3fc2
2016-07-08 08:48:11 +00:00
Treehugger Robot
c4dc4f3fc2
Merge "Add UIDs for system DNS and tethering DNS"
2016-07-08 08:43:55 +00:00
Daniel Rosenberg
906c5574b3
resolve merge conflicts of 786f5de to nyc-mr1-dev-plus-aosp
...
Change-Id: I64433da7565ad15edb9c572558c4495eeacbf5c7
2016-07-07 19:40:21 -07:00
TreeHugger Robot
786f5def5b
Merge "Switch fastboot to new A/B spec" into nyc-mr1-dev
2016-07-08 00:20:46 +00:00
Daniel Rosenberg
563fcf6f69
Switch fastboot to new A/B spec
...
Slots are now referred to as a and b instead
of _a and _b. For the moment, _a and _b will
still be supported. For old devices that
support A/B, they are assumed to have 2 slots.
Bug: 29643845
Change-Id: Ieab6bed7b4977d8386dcec0afa434371f54bd63f
2016-07-07 15:36:43 -07:00
Tim Murray
6469fa2a7e
resolve merge conflicts of 3a29e34 to nyc-mr1-dev-plus-aosp
...
Change-Id: I4edd53094a98fcb3cd3e1b063122d13f80d36d3c
2016-07-07 13:40:18 -07:00
Tim Murray
3a29e344b0
Update FIFO settings for new uses of FIFO.
...
Adjust FIFO timings as well as allow SurfaceFlinger to use FIFO.
bug 24503801
Change-Id: I2c21d4c1788777c2d0d77227bb872701b35c4ff6
2016-07-07 11:35:41 -07:00
Mark Salyzyn
aa32e374c0
Merge \\\"logcat: help spelling correction\\\" am: 20a172fca7 am: 59cce987ec
...
am: 4c04c98a31
2016-07-06 21:55:15 +00:00
Mark Salyzyn
4c04c98a31
Merge \\"logcat: help spelling correction\\" am: 20a172fca7
...
am: 59cce987ec
2016-07-06 21:49:12 +00:00
Mark Salyzyn
59cce987ec
Merge \"logcat: help spelling correction\"
...
am: 20a172fca7
2016-07-06 21:46:29 +00:00
Treehugger Robot
20a172fca7
Merge "logcat: help spelling correction"
2016-07-06 21:36:07 +00:00
Mark Salyzyn
6a70a53235
Merge \\\"logcat: format verbs and adverbs\\\" am: 82fb012a03 am: b13d0ce160
...
am: b6dbe28746
2016-07-06 20:36:27 +00:00
Mark Salyzyn
e735a7305b
logcat: help spelling correction
...
threadtime and added clarity for adverbs
Bug: 29916087
Change-Id: Idbed8bc74147c105eaced940d035d0649a244b18
2016-07-06 13:33:57 -07:00
Mark Salyzyn
b6dbe28746
Merge \\"logcat: format verbs and adverbs\\" am: 82fb012a03
...
am: b13d0ce160
2016-07-06 20:32:07 +00:00
Mark Salyzyn
b13d0ce160
Merge \"logcat: format verbs and adverbs\"
...
am: 82fb012a03
2016-07-06 20:27:29 +00:00
Treehugger Robot
82fb012a03
Merge "logcat: format verbs and adverbs"
2016-07-06 20:18:00 +00:00
Mark Salyzyn
8e958c7aae
Merge \\\"libcutils: canned_fs_config.c drop tabs\\\" am: 4ee9ed5366 am: ec129fe06c
...
am: a8dbadd54e
2016-07-06 18:59:04 +00:00
Mark Salyzyn
a8dbadd54e
Merge \\"libcutils: canned_fs_config.c drop tabs\\" am: 4ee9ed5366
...
am: ec129fe06c
2016-07-06 18:56:34 +00:00
Mark Salyzyn
ec129fe06c
Merge \"libcutils: canned_fs_config.c drop tabs\"
...
am: 4ee9ed5366
2016-07-06 18:54:23 +00:00
Treehugger Robot
4ee9ed5366
Merge "libcutils: canned_fs_config.c drop tabs"
2016-07-06 18:50:22 +00:00
Mark Salyzyn
9cfd1c6ebc
logcat: format verbs and adverbs
...
Bug: 29916087
Change-Id: I039c95b9dc0aa88f1219121513899934381453ae
2016-07-06 11:16:07 -07:00
Mark Salyzyn
768cbb0404
libcutils: canned_fs_config.c drop tabs
...
- replace tabs with spaces, get indent right
- Sort header order as per Android coding standard
Change-Id: I634f6f716a368ce5565ccc880c51406042f312bf
2016-07-06 10:45:11 -07:00
Dan Stoza
5d636e830f
NativeWindow: Add LAST_[DE]QUEUE_DURATION queries
...
am: 94ededa387
2016-07-06 16:27:37 +00:00
Erik Kline
d63cf7d85a
Add UIDs for system DNS and tethering DNS
...
Bug: 29420831
Bug: 29881876
Change-Id: I7a48f980f0e52a3d322c4c02988d48fc6df643ca
2016-07-06 11:13:59 +09:00
Dan Stoza
94ededa387
NativeWindow: Add LAST_[DE]QUEUE_DURATION queries
...
Adds two new enums to enable querying the duration of the last
dequeue or queue operations to a Surface/ANativeWindow.
Bug: 29413700
Change-Id: Ifa16755911c4a3c013a7128dd4038d328109c32d
2016-07-01 16:07:00 -07:00
Daniel Rosenberg
5dbec684ed
Merge \"Fix missing newline in Fastboot help.\" into nyc-mr1-dev
...
am: 7f871b4249
2016-07-01 04:13:50 +00:00
TreeHugger Robot
7f871b4249
Merge "Fix missing newline in Fastboot help." into nyc-mr1-dev
2016-07-01 04:09:14 +00:00
Srinath Sridharan
ee85737277
Merge \"Not dynamically add system-background tasks to bg_schedboost_fd.\" into nyc-mr1-dev
...
am: 08d097adb4
2016-06-30 22:55:43 +00:00
Yabin Cui
1b8159e7ab
Merge \"init: use libbootloader_message.\" into nyc-mr1-dev
...
am: ca4cf4e4af
2016-06-30 22:55:42 +00:00
Srinath Sridharan
08d097adb4
Merge "Not dynamically add system-background tasks to bg_schedboost_fd." into nyc-mr1-dev
2016-06-30 21:46:22 +00:00
Srinath Sridharan
70a415f8b8
Not dynamically add system-background tasks to bg_schedboost_fd.
...
System-background tasks can be either in bg_schedboost_fd or fg_schedboost_fd.
It is better to set the right cgroup via init.rc and not dynamically in
set_cpuset_policy.
BUG: 29533997
BUG: 29512132
Change-Id: If5dab78eafbe2d0d03fd7fd3f36d794cb4a7645f
2016-06-30 14:38:07 -07:00
Yabin Cui
ca4cf4e4af
Merge "init: use libbootloader_message." into nyc-mr1-dev
2016-06-30 21:08:30 +00:00
Elliott Hughes
74fa5b8dba
Merge \\\"Fix the generated getevent labels.\\\" am: 80beb506cf am: 2f589bf974
...
am: dc4493cbbb
2016-06-29 23:52:56 +00:00
Elliott Hughes
dc4493cbbb
Merge \\"Fix the generated getevent labels.\\" am: 80beb506cf
...
am: 2f589bf974
2016-06-29 23:50:35 +00:00
Elliott Hughes
2f589bf974
Merge \"Fix the generated getevent labels.\"
...
am: 80beb506cf
2016-06-29 23:48:12 +00:00
Yabin Cui
0b1252cca0
init: use libbootloader_message.
...
Bug: 29582118
Change-Id: I6285b29774a11d6dda8496c7c73e4c1d17a672bd
2016-06-29 16:44:02 -07:00
