Steven Moreland
53ae57e0bf
Merge "init.rc: add class_start early_hal" am: 7bbd2a5290 am: 795eb840a7
...
am: 4bf15ab6b5
Change-Id: Ieae51492b03168b13224c252d075c03c8f80942d
2017-04-05 00:47:01 +00:00
Steven Moreland
4bf15ab6b5
Merge "init.rc: add class_start early_hal" am: 7bbd2a5290
...
am: 795eb840a7
Change-Id: I8647b157c27385b0ed73db7f84e58d32eb17a0ee
2017-04-05 00:42:31 +00:00
Steven Moreland
795eb840a7
Merge "init.rc: add class_start early_hal"
...
am: 7bbd2a5290
Change-Id: I4a87771a45921b9fc7124c9a0d25ebc8bb0c9088
2017-04-05 00:40:35 +00:00
Treehugger Robot
7bbd2a5290
Merge "init.rc: add class_start early_hal"
2017-04-05 00:35:00 +00:00
Dan Shi
8a514bc30b
Merge "Add test config to libappfuse_test" am: dccf5a1dc8 am: 31d4b50cc4
...
am: b44505e956
Change-Id: Iefe160951c3f638faee7e8e1f1ff63ed9133325c
2017-04-05 00:19:53 +00:00
Dan Shi
b44505e956
Merge "Add test config to libappfuse_test" am: dccf5a1dc8
...
am: 31d4b50cc4
Change-Id: I09438da05fb2557342c21f97556757456544fa0c
2017-04-05 00:13:58 +00:00
Dan Shi
31d4b50cc4
Merge "Add test config to libappfuse_test"
...
am: dccf5a1dc8
Change-Id: I5babe9e60419aaf52ef323a8640a6ab315e5a93c
2017-04-05 00:11:28 +00:00
Dan Shi
dccf5a1dc8
Merge "Add test config to libappfuse_test"
2017-04-05 00:04:39 +00:00
Yin-Chia Yeh
baef8fd8e0
Merge "Revert "Include vendor gralloc0 flags in gralloc1 conversion."" into oc-dev
...
am: 3433cbd567
Change-Id: I049a295140327c982ece8946187cf8b0d8cc678d
2017-04-04 22:28:01 +00:00
Yin-Chia Yeh
3433cbd567
Merge "Revert "Include vendor gralloc0 flags in gralloc1 conversion."" into oc-dev
2017-04-04 22:22:03 +00:00
Mark Salyzyn
5a62e33bdc
Merge "logcatd: introduce logcatd executable" am: 47356e69fe am: d5f7cc74a6
...
am: bf363286b3
Change-Id: I9a363c1c19f952b3d0cd327860537a7ca59fe55f
2017-04-04 21:58:14 +00:00
Mark Salyzyn
bf363286b3
Merge "logcatd: introduce logcatd executable" am: 47356e69fe
...
am: d5f7cc74a6
Change-Id: Iacef578365d0c708ac3288330e3ae072f6763a05
2017-04-04 21:56:28 +00:00
Mark Salyzyn
d5f7cc74a6
Merge "logcatd: introduce logcatd executable"
...
am: 47356e69fe
Change-Id: I0cc69ca055e82f3933d922baa3dfbe2efc68dded
2017-04-04 21:54:35 +00:00
Treehugger Robot
47356e69fe
Merge "logcatd: introduce logcatd executable"
2017-04-04 21:48:23 +00:00
Steven Moreland
5d56bad4bd
init.rc: add class_start early_hal
...
This class is used to start hals which are required in order to mount
data (for instance keymaster).
Test: works to start early_hal in internal
Bug: 36278706
Change-Id: If06908135e59b187683d8cf4cc4a00b490559081
2017-04-04 21:22:47 +00:00
Christopher Ferris
c98ed66fe7
Merge "Add DwarfOp support." am: 3f220aaa63 am: 1ab138c64e
...
am: 2618277e5a
Change-Id: Ic7dde684f6a75db586aad2e3d96a223eb416f911
2017-04-04 21:06:55 +00:00
Christopher Ferris
2618277e5a
Merge "Add DwarfOp support." am: 3f220aaa63
...
am: 1ab138c64e
Change-Id: Id502479a0a7646dbea7026e2f8a114acc679505d
2017-04-04 21:05:24 +00:00
Christopher Ferris
1ab138c64e
Merge "Add DwarfOp support."
...
am: 3f220aaa63
Change-Id: I1bf8a417889a9ad31055c05e3149f985e1dbc591
2017-04-04 21:02:54 +00:00
Mark Salyzyn
32fb33ad21
Merge "logd: cap out-of-order entry search" into oc-dev
...
am: 3dcd014ef4
Change-Id: I8dd24eab18f82b69836911ac9206cce023a978bd
2017-04-04 20:56:53 +00:00
Christopher Ferris
3f220aaa63
Merge "Add DwarfOp support."
2017-04-04 20:53:43 +00:00
Mark Salyzyn
3dcd014ef4
Merge "logd: cap out-of-order entry search" into oc-dev
2017-04-04 20:49:08 +00:00
Mark Salyzyn
5adcb3e3e7
Merge "logd: cap out-of-order entry search" am: b15882faab am: 1b559e2f8d
...
am: 3cb28fd064
Change-Id: I78eae5076547e541c09e0a8d9c684c9a3e358e57
2017-04-04 20:22:03 +00:00
Yabin Cui
7ecf6c0e79
Merge "adb: don't reset usb when connecting it." am: 4b8087aeb2 am: 0c1bad300c
...
am: e7affdc47c
Change-Id: Ibe2772d021a51281263a0bdaf83d2157b71f03e6
2017-04-04 20:21:51 +00:00
Mark Salyzyn
2871101550
Merge "libcutils: create private/fs_config.h" am: 832f6c704a am: f8e1b8005b
...
am: 76a2b68d77
Change-Id: I5193f3ee61989e6f8ab9e9f1242fff508f3576b5
2017-04-04 20:21:37 +00:00
Yin-Chia Yeh
164ec4ad26
Revert "Include vendor gralloc0 flags in gralloc1 conversion."
...
This reverts commit 944e5e0c52 .
Test: fix b/36876770
Bug: b/36876770
Change-Id: Ibbf1a5e04ff1f61061cf0bb679306324d1f543d3
2017-04-04 13:17:54 -07:00
Mark Salyzyn
3cb28fd064
Merge "logd: cap out-of-order entry search" am: b15882faab
...
am: 1b559e2f8d
Change-Id: I759a08327d8e84cabf13fedc445308d91cbb834d
2017-04-04 20:17:23 +00:00
Yabin Cui
e7affdc47c
Merge "adb: don't reset usb when connecting it." am: 4b8087aeb2
...
am: 0c1bad300c
Change-Id: I127f48ec5f6cce4dd32a98e90a099eb4f67dc609
2017-04-04 20:17:10 +00:00
Mark Salyzyn
76a2b68d77
Merge "libcutils: create private/fs_config.h" am: 832f6c704a
...
am: f8e1b8005b
Change-Id: Iac74084709548f685a4b4aeb5f872beb47372d7e
2017-04-04 20:16:57 +00:00
Mark Salyzyn
1b559e2f8d
Merge "logd: cap out-of-order entry search"
...
am: b15882faab
Change-Id: I260b98c2d3712bc4dc508d9283923e8a0495e59e
2017-04-04 20:12:00 +00:00
Yabin Cui
0c1bad300c
Merge "adb: don't reset usb when connecting it."
...
am: 4b8087aeb2
Change-Id: Idbd9241dec2cf35568fd110dc1fa6a56615de941
2017-04-04 20:11:45 +00:00
Mark Salyzyn
f8e1b8005b
Merge "libcutils: create private/fs_config.h"
...
am: 832f6c704a
Change-Id: Ifa6f5bd32182be272b5302c855a962611e253c8c
2017-04-04 20:11:32 +00:00
Jin Qian
0b217a40e0
Merge changes from topic 'refcount' into oc-dev
...
am: f4c0dcae69
Change-Id: Ib1ed7331dd83c9110d7b36de00f1a64dd98d0ed4
2017-04-04 20:07:50 +00:00
Jin Qian
f4c0dcae69
Merge changes from topic 'refcount' into oc-dev
...
* changes:
storaged: stop binder threads before exiting
storaged: exit if batteryproperties service is dead.
storaged: use sp<> to keep refcount for storaged_t object
2017-04-04 19:44:06 +00:00
Jin Qian
26b2be0d30
storaged: stop binder threads before exiting
...
Test: kill healthd when storaged is running
Bug: 36652060
Change-Id: Ie55fb6cb7c8c6df6ce6bc4820c476b90cc0f4165
2017-04-04 19:44:01 +00:00
Treehugger Robot
b15882faab
Merge "logd: cap out-of-order entry search"
2017-04-04 19:41:52 +00:00
Christopher Ferris
55d22ef67c
Add DwarfOp support.
...
Bug: 23762183
Test: New unit tests pass.
Change-Id: I9581701ee2721283a1114adab4e1bcff881980cc
2017-04-04 12:35:50 -07:00
Treehugger Robot
4b8087aeb2
Merge "adb: don't reset usb when connecting it."
2017-04-04 19:29:09 +00:00
Mark Salyzyn
832f6c704a
Merge "libcutils: create private/fs_config.h"
2017-04-04 19:15:09 +00:00
Mark Salyzyn
a9403f0db8
libcutils: create private/fs_config.h
...
private/fs_config.h is required in order to build an independent
test that requires internal binary knowledge of the
etc/fs_config_(files|dirs) files.
Test: compile
Bug: 36071012
Change-Id: I268bcfdbb6d45b7bf6040cbf307a4e34812f5fef
2017-04-04 19:14:32 +00:00
Mark Salyzyn
775cd22222
logd: cap out-of-order entry search
...
Reduce the period we are willing to look back at for out-of-order
entries. Cap the number of iterations we are willing to look back
for out-of-order entries to 300.
Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 36875387
Bug: 36874561
Bug: 36861142
Change-Id: Icee289dfc0a37ccab9912dc8ab40a10ef3967b7a
2017-04-04 11:12:31 -07:00
Mark Salyzyn
0f92fdc5d6
logd: cap out-of-order entry search
...
Reduce the period we are willing to look back at for out-of-order
entries. Cap the number of iterations we are willing to look back
for out-of-order entries to 300.
Test: gTest liblog-unit-tests, logd-unit-tests and logcat-unit-tests
Bug: 36875387
Bug: 36874561
Bug: 36861142
Change-Id: Icee289dfc0a37ccab9912dc8ab40a10ef3967b7a
2017-04-04 11:03:26 -07:00
Christopher Ferris
de393a5440
Merge "Add overflow checks in Memory objects." am: 856bccbdc3 am: 69b4dfe13e
...
am: 7c3e179f0f
Change-Id: I0e00217bfb3f7aea22b9a4b75d0166d82457f8f6
2017-04-04 17:46:13 +00:00
Jin Qian
566e63da53
storaged: exit if batteryproperties service is dead.
...
storaged relies on batteryproperties service (healthd) to provide
charger stats. If healthd is killed, kill storaged as well. Both
will be restarted by init process anyway to restore a correct state.
Test: kill healthd when storaged is running
Bug: 36652060
Merged-In: Ia785bb6f5ea259aa43cd1efab9505ebefaf3db12
Change-Id: Ia785bb6f5ea259aa43cd1efab9505ebefaf3db12
2017-04-04 17:45:41 +00:00
Christopher Ferris
7c3e179f0f
Merge "Add overflow checks in Memory objects." am: 856bccbdc3
...
am: 69b4dfe13e
Change-Id: I8643664cfd8b0738fdcd7ed4c9815307acdd46e8
2017-04-04 17:41:44 +00:00
Christopher Ferris
69b4dfe13e
Merge "Add overflow checks in Memory objects."
...
am: 856bccbdc3
Change-Id: Id9e9c65c724d1ce75cc3cefed06d14f5785d2259
2017-04-04 17:37:15 +00:00
Christopher Ferris
856bccbdc3
Merge "Add overflow checks in Memory objects."
2017-04-04 17:29:49 +00:00
Yabin Cui
5d002b8d6a
adb: don't reset usb when connecting it.
...
Calling libusb_reset_device() resets the usb connection with device
on linux platform. It can interfere with other usb interfaces and only
works on linux.
Removing it only affects when adb server is killed while doing IO with
device, which will be solved in later patches.
Bug: http://b/32952319
Test: none
Change-Id: I19522435eadd938ff95d49cbae3bcaa5c8f6d184
2017-04-04 10:29:21 -07:00
Mark Salyzyn
a1c10c01da
Merge "logcat: Add -h and --help flags" am: 23e308398f am: d3d3dddd31
...
am: 83f8d0b5c2
Change-Id: I3fe4e2d27f248bd6e5ed531c2f7602dfcb912460
2017-04-04 17:06:01 +00:00
Tom Cherry
7fbc616e70
Merge "init: use read_file and write_file to implement do_copy builtin" am: 554c1fa234 am: ed73c21658
...
am: 732245aacb
Change-Id: Ic9164bdf28abe35857047259a6d5cf96d357e34f
2017-04-04 17:05:43 +00:00
Mark Salyzyn
83f8d0b5c2
Merge "logcat: Add -h and --help flags" am: 23e308398f
...
am: d3d3dddd31
Change-Id: I36e97f7ed9c0a5ee81c8608320574cd44399b4c7
2017-04-04 16:57:26 +00:00