Nick Kralevich
53b3982a41
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
am: 77dd50b470
am: 89c789ae47
...
am: 4a843ec4e4
-s ours
* commit '4a843ec4e42b02eae240d32a9c206afde186f370':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 21:17:04 +00:00
Nick Kralevich
4a843ec4e4
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
am: 77dd50b470
...
am: 89c789ae47
* commit '89c789ae47031eb6bde161991005f7a6e8198556':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 21:06:44 +00:00
Nick Kralevich
89c789ae47
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
...
am: 77dd50b470
* commit '77dd50b4707b0b2b12d4ca136d8c0529d18eedc1':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 20:57:19 +00:00
Josh Gao
280cc0a639
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
am: 7f0d750b2d
am: 41f72f0537
...
am: f740908c5b
-s ours
* commit 'f740908c5b5f39b47b9ddbe1e54ce27204e1c1aa':
Don't create tombstone directory.
2016-02-24 20:19:01 +00:00
Dan Willemsen
ed1d7aeee4
Remove duplicate fdevent.cpp entry
...
Fixes the following warnings:
build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: overriding commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
build/core/binary.mk:894: warning: ignoring old commands for target
`out/target/product/bullhead/obj_arm/STATIC_LIBRARIES/libadbd_intermediates/fdevent.o'
Change-Id: Id4b13574e568284cefbc3a763d40843e73ddbd3d
(cherry picked from commit 582c8fe1d4
)
2016-02-24 12:14:48 -08:00
Josh Gao
91b48c3796
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Nick Kralevich
24f4d6495e
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
am: bf8ace32ef
am: a03485daa5
...
am: 9b26997a1f
* commit '9b26997a1fb3fa05886fbe3b66eff656b7c1bc66':
ensure /data/tombstones exists on all Android devices
2016-02-24 20:01:22 +00:00
Josh Gao
f740908c5b
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
am: 7f0d750b2d
...
am: 41f72f0537
* commit '41f72f05370fd7fa651131daec5ecd4e89afc9f5':
Don't create tombstone directory.
2016-02-24 19:56:08 +00:00
Nick Kralevich
9b26997a1f
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
am: bf8ace32ef
...
am: a03485daa5
* commit 'a03485daa5491b4315d01d0ef881c4876882db54':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:56:00 +00:00
Nick Kralevich
77dd50b470
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours
...
am: d5cb8b417b
* commit 'd5cb8b417bd938d9c1ef1262df88ed3d90706301':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:55:37 +00:00
Josh Gao
41f72f0537
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
...
am: 7f0d750b2d
* commit '7f0d750b2d8907816b3d9b171f2eebda38be6e03':
Don't create tombstone directory.
2016-02-24 19:49:23 +00:00
Nick Kralevich
a03485daa5
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
...
am: bf8ace32ef
* commit 'bf8ace32efb4903642b0e372a5fe939685686467':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:49:12 +00:00
Nick Kralevich
d5cb8b417b
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
...
am: b760e61686
-s ours
* commit 'b760e61686e592eb268ffe667e6c164b0aa29f47':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:48:55 +00:00
Nick Kralevich
b760e61686
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours
...
am: 505a431468
* commit '505a43146861f5e5f3852b2cb47ff8af54d04b75':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:43:01 +00:00
Josh Gao
7f0d750b2d
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
...
am: 3ee4a0be2a
* commit '3ee4a0be2ae8b21a2235278c88d40b4feb3ddd08':
Don't create tombstone directory.
2016-02-24 19:37:01 +00:00
Nick Kralevich
bf8ace32ef
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
...
am: 077a9ffe40
* commit '077a9ffe402c0776328bd5a4e85230bba458dc47':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:36:45 +00:00
Josh Gao
3ee4a0be2a
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
...
am: 338f1802ee
* commit '338f1802ee7d87bb4ea2f3fe9ef1c72e1784188b':
Don't create tombstone directory.
2016-02-24 19:31:16 +00:00
Nick Kralevich
505a431468
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
...
am: 75ccd732f3
-s ours
* commit '75ccd732f3fef68fc568d96d00a412920798f55c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:31:07 +00:00
Nick Kralevich
077a9ffe40
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
...
am: 6d7ce7b14c
* commit '6d7ce7b14c906eff4488bddb0338a38f57eac1de':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:31:04 +00:00
Josh Gao
338f1802ee
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
...
am: 0cf99e2b61
* commit '0cf99e2b618ac5c8a495f607b1978fcd9e3ee827':
Don't create tombstone directory.
2016-02-24 19:25:50 +00:00
Nick Kralevich
75ccd732f3
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours
...
am: d61ebb0851
* commit 'd61ebb085172200c02af73e030646baf3301028c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:25:39 +00:00
Nick Kralevich
6d7ce7b14c
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
...
am: 4d4eb0db97
* commit '4d4eb0db978bca41727ed21406da42332367de7d':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:25:38 +00:00
Nick Kralevich
d61ebb0851
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
...
am: c61a896f20
-s ours
* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:18:41 +00:00
Josh Gao
0cf99e2b61
Don\'t create tombstone directory. am: cb9625cbe5
...
am: 99b8a56616
* commit '99b8a5661614c3b973ab421ecff4ae40249c1579':
Don't create tombstone directory.
2016-02-24 19:11:53 +00:00
Nick Kralevich
4d4eb0db97
ensure /data/tombstones exists on all Android devices am: e2796207ee
...
am: 9660c6759e
* commit '9660c6759e165ddbc91f823672ba9631199ae9dc':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:11:42 +00:00
Nick Kralevich
c61a896f20
ensure /data/tombstones exists on all Android device. DO NOT MERGE
...
am: 9c0ed66313
* commit '9c0ed663138138bb40396bfd350f137e5057277b':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:11:38 +00:00
Josh Gao
99b8a56616
Don\'t create tombstone directory.
...
am: cb9625cbe5
* commit 'cb9625cbe54f009c216a1f50fcaee15ee3478357':
Don't create tombstone directory.
2016-02-24 19:05:34 +00:00
Nick Kralevich
9660c6759e
ensure /data/tombstones exists on all Android devices
...
am: e2796207ee
* commit 'e2796207ee5a1ff2ebea30bdcf6d2c2553546b86':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:05:12 +00:00
Glenn Kasten
6bceddcaee
Merge "Restore audio tee sink" into nyc-dev
2016-02-24 16:40:23 +00:00
William Luh
5cb3200b5c
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours am: 43c0f28c11
am: ec0d1037ab
am: 785f82c09d
...
am: 041cb4aa55
-s ours
* commit '041cb4aa55a3a1dee488dfa954772d67103a5566':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 04:29:31 +00:00
William Luh
041cb4aa55
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours am: 43c0f28c11
am: ec0d1037ab
...
am: 785f82c09d
* commit '785f82c09d113126e6575d257df2bbf8b0823afe':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 03:01:13 +00:00
William Luh
785f82c09d
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours am: 43c0f28c11
...
am: ec0d1037ab
* commit 'ec0d1037ab53465734934f2c91a5e0c015881633':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:54:36 +00:00
William Luh
ec0d1037ab
Add macro to call event logger for errors. DO NOT MERGE am: 769cba57e4
-s ours
...
am: 43c0f28c11
* commit '43c0f28c1135bd1f1640441e3fa259be04aa04b0':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:46:27 +00:00
William Luh
43c0f28c11
Add macro to call event logger for errors. DO NOT MERGE
...
am: 769cba57e4
-s ours
* commit '769cba57e446be099c792516486a304a18ee2952':
Add macro to call event logger for errors. DO NOT MERGE
2016-02-24 02:39:45 +00:00
Josh Gao
7b84c9bf93
Merge changes from topic 'adb_cherrypick' into nyc-dev
...
* changes:
adb: sysdeps_test: improve smoke test.
adb: check for an error response from adbd between each write.
adbd: restore the old error handling behavior.
adb: change unsigned to uint32_t in sync struct definitions.
adb: detect when the client disconnects in wait-for-device.
adb: make fdevent_test, socket_test compile on Windows.
adb: add fd exhaustion test, fix errno reporting in sysdeps_win32.
adb: move win32 fd base to 2048, fix fd allocation.
adb: don't emulate fdevent or socketpair on Windows.
adb: fix clang-format for access modifier dedent.
Add missing liblog dependency
adb: sysdeps_win32: actually change ExitThread to _endthreadex.
adb: make adb_thread_func_t return void, add adb_thread_exit.
adb: redact reference to secret internal time machine.
adb: mkdirs fixes
adb: sysdeps: add support for joining threads.
adb: allow wine's output for sysdeps_win32 strerror test.
adb: setsid() for adb host server.
adb: make ctrl-c when spawning a daemon not kill the daemon.
adb: fix mkdirs test.
2016-02-24 00:50:36 +00:00
Jesse Hall
2f9cd05c47
Merge "native_loader: add libvulkan.so to public native library list" into nyc-dev
2016-02-24 00:50:10 +00:00
Jesse Hall
dee3d96c01
native_loader: add libvulkan.so to public native library list
...
Change-Id: I2228af5ec4b815631a9c5ca745718807d58028a3
2016-02-23 16:16:47 -08:00
William Luh
769cba57e4
Add macro to call event logger for errors. DO NOT MERGE
...
Bug:23180694
Change-Id: I566a290334345f48013029534efef3e08e726e40
2016-02-23 16:04:34 -08:00
Glenn Kasten
845a4ffef8
Restore audio tee sink
...
Bug: 27323882
Change-Id: I1131c0537942c8f7cbf9ff6cc6847ab7e93e6187
2016-02-23 15:23:46 -08:00
Mohamad Ayyash
5dac46ac94
Merge "Revert "Revert "Update make_ext4fs_internal param-list to match new implementation""" into nyc-dev
2016-02-23 22:54:27 +00:00
Yabin Cui
959dea3585
Merge "healthd: support reading charge status from BatteryMonitor." into nyc-dev
2016-02-23 22:42:58 +00:00
Dimitry Ivanov
f44ecde588
nativeloader: Export FindNamespaceByClassLoader
...
Bug: http://b/27189432
Change-Id: Ib80dcce949276ee620f601c47b20f783708e8e85
(cherry picked from commit 0cd10d83e4
)
2016-02-23 11:50:44 -08:00
Dimitry Ivanov
c914ebd484
nativeloader: refactor FindNamespaceByClassLoader method
...
FindNamespaceByClassLoader returns android_namespace_t* to make
it suitable for exporting this functionality.
Bug: http://b/27189432
Change-Id: Ifef3de753192178e0184fb114596fe956fde2826
(cherry picked from commit 34fa704df4
)
2016-02-23 11:50:28 -08:00
Dimitry Ivanov
32912090e6
Merge "Move libnativeloader headers into libnativeloader." into nyc-dev
2016-02-23 19:45:22 +00:00
Yabin Cui
b0580d710f
healthd: support reading charge status from BatteryMonitor.
...
recovery needs to know whether the battery is charged.
Bug: 26879394
Change-Id: Ie2a1d06e81878efa3ff432c2015d409a625e473e
(cherry picked from commit aedf6038dc
)
2016-02-23 11:01:21 -08:00
Yabin Cui
126f4d65ca
Merge "healthd: separate libbatterymonitor for use in recovery." into nyc-dev
2016-02-23 18:55:54 +00:00
James Hawkins
85def183bd
Merge "bootstat: Record metrics for factory_reset and time_since_factory_reset." into nyc-dev
2016-02-23 18:52:55 +00:00
Yabin Cui
f6dbc6d4b8
healthd: separate libbatterymonitor for use in recovery.
...
Bug: 26879394
Change-Id: I97b5b4994c42988ce43f5085b8b4b25e9e80c9fa
(cherry picked from commit e98e177a34
)
2016-02-23 10:52:43 -08:00
Yabin Cui
ac3387b71b
healthd: init members of BatteryMonitor.
...
Bug: 26879394
Change-Id: I09a6c78137f91a0c88bf4ba1e8890b4ec31dcf2c
(cherry picked from commit db04a49a6f
)
2016-02-23 10:46:38 -08:00
Todd Kjos
11cde567a8
Mount schedTune cgroup as /dev/stune
...
Make stune consistent with the other cgroups mounted under /dev
Change-Id: I0fe7120ad2afbe8e6a3c9f72cc3f465de618d344
2016-02-23 09:08:54 -08:00