Commit Graph

30641 Commits

Author SHA1 Message Date
Jin Qian d195ab0b23 Merge "fastboot: use filename instead of fd to generate filesystem image" am: 010f7714b7
am: 104470da0f

Change-Id: I3e1e72bffe47188f49ae3cf4f0cfa44fcd9b0ef4
2017-06-01 06:13:54 +00:00
Jin Qian 104470da0f Merge "fastboot: use filename instead of fd to generate filesystem image"
am: 010f7714b7

Change-Id: I5b68c8228bd5fc018f858a200f0413e7c00a8791
2017-06-01 06:11:53 +00:00
Treehugger Robot 010f7714b7 Merge "fastboot: use filename instead of fd to generate filesystem image" 2017-06-01 06:05:41 +00:00
Mark Salyzyn 301770b2c7 Merge "logcat: logcatd: make logcatd killable" am: f2c1ef53ff
am: 69f28a69e3

Change-Id: I4a75c92ea0c23f2c00be5cf0ebaed768f354ae4f
2017-05-31 22:30:24 +00:00
Mark Salyzyn 69f28a69e3 Merge "logcat: logcatd: make logcatd killable"
am: f2c1ef53ff

Change-Id: Ibca636745a95a5f55bddfdd1a0c8067b9078655a
2017-05-31 22:28:22 +00:00
Treehugger Robot f2c1ef53ff Merge "logcat: logcatd: make logcatd killable" 2017-05-31 22:24:06 +00:00
Jin Qian 4a335829da fastboot: use filename instead of fd to generate filesystem image
mke2fs tool takes a filename and has its own open function to handle
output file. Change fastboot in preparation to switch from make_ext4
to mke2fs.

Test: fastboot format:ext4 userdata
Bug: 35219933
Change-Id: I7a31cb215f443a4a7cb0bfc23ec28c121a6101e6
2017-05-31 21:23:12 +00:00
Mark Salyzyn 30ea96e14e logcat: logcatd: make logcatd killable
Near last resort kill logcatd, set /proc/self/oom_score_adj to -600.

Can kill to keep system_server, telephony and bluetooth.

Test: manual, start logpersist, runs
Bug: 62147352
Change-Id: I3723761bf1d2b79ce6a9557d2e78f91cc5497e96
2017-05-31 11:27:22 -07:00
George Burgess IV 21ea871839 Merge "logging: make LOG(FATAL) always run with the static analyzer." am: b46fd68653
am: 2e9af0942c

Change-Id: I1f268e34a9c85bb7e57911a9881c39c60afd87e0
2017-05-31 17:05:57 +00:00
George Burgess IV 2e9af0942c Merge "logging: make LOG(FATAL) always run with the static analyzer."
am: b46fd68653

Change-Id: I761248df16cd0c7185bbd0934501151a18bdbdf5
2017-05-31 16:55:55 +00:00
Treehugger Robot b46fd68653 Merge "logging: make LOG(FATAL) always run with the static analyzer." 2017-05-31 16:41:15 +00:00
George Burgess IV 6466ced8f6 logging: make LOG(FATAL) always run with the static analyzer.
::android::base::GetMinimumLogSeverity() is defined externally, so the
static analyzer was allowed to assume that we continue executing after a
LOG(FATAL).

I manually audited all of the code I have access to, and the only
"change the minimum log severity" statements I can see keep FATAL
enabled (...and continuing after a FATAL is highly sketchy to me
anyway).

(I'm sure I tested this at some point in making the previous patch. I
probably broke it in a refactor before sending it out for review; my
bad. :) )

Bug: None
Test: m without the static-analyzer builds; m with it yields fewer
false positives.

Change-Id: I216cd2034e1daa8d6f6c5e776f64b4cce88bb938
2017-05-31 14:41:22 +00:00
Narayan Kamath 6ca71ad137 Merge "tombstoned: allow intercepts for java traces." am: 1e63347425
am: 907a666e22

Change-Id: Id0bb9f7d27991a137182cf4217e6fd1e075d2867
2017-05-31 12:16:45 +00:00
Narayan Kamath 907a666e22 Merge "tombstoned: allow intercepts for java traces."
am: 1e63347425

Change-Id: I326308ed1fa4bdbb3380a19403fecb93386ec811
2017-05-31 12:07:04 +00:00
Narayan Kamath 1e63347425 Merge "tombstoned: allow intercepts for java traces." 2017-05-31 11:55:50 +00:00
Narayan Kamath a73df601b7 tombstoned: allow intercepts for java traces.
All intercept requests and crash dump requests must now specify a
dump_type, which can be one of kDebuggerdNativeBacktrace,
kDebuggerdTombstone or kDebuggerdJavaBacktrace. Each process can have
only one outstanding intercept registered at a time.

There's only one non-trivial change in this changeset; and that is
to crash_dump. We now pass the type of dump via a command line
argument instead of inferring it from the (resent) signal, this allows
us to connect to tombstoned before we wait for the signal as the
protocol requires.

Test: debuggerd_test

Change-Id: I189b215acfecd08ac52ab29117e3465da00e3a37
2017-05-31 10:35:32 +01:00
Josh Gao a08c949c7a Merge "adb: fix deadlock." am: 68599f5759
am: d5a2cdb72c

Change-Id: I671768311d2c2969bc5797efc43c84175b417ae7
2017-05-31 02:16:48 +00:00
Josh Gao d5a2cdb72c Merge "adb: fix deadlock."
am: 68599f5759

Change-Id: I9c57920319ef8b76b313c6fa736a282fe54e857b
2017-05-31 02:12:20 +00:00
Treehugger Robot 68599f5759 Merge "adb: fix deadlock." 2017-05-31 02:03:42 +00:00
Josh Gao d1a3e8f1ab adb: fix deadlock.
libusb hotplug callbacks are called with the libusb lock taken, and we
call into libusb with our local mutex, so we need to enforce an ordering
between the two. Instead of calling device_connected or
device_disconnected directly, enqueue them onto the main thread.

Bug: http://b/62200735
Test: manually hotplugged a device
Change-Id: Ic5d55db83b47f4bb60f124ce94ddfe06f5f1a0c6
2017-05-30 17:09:42 -07:00
James Hawkins aa2dab59af Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." am: 45d0cbf00b
am: 9fb006b57a

Change-Id: Ie19ee731bfc9f7927ed70409524dec081c8a001b
2017-05-31 00:08:39 +00:00
James Hawkins 9fb006b57a Merge "bootstat: Log factory_reset_boot_complete separately from ota_*."
am: 45d0cbf00b

Change-Id: I1054febb3608368b7166916e15c7ee49840a6791
2017-05-31 00:04:39 +00:00
Tom Cherry 3d2aa93e1d Merge "init: allow ':' in property names" am: af95ecdb04
am: 6d2a27768d

Change-Id: I8eaadce8365b86f8a3cab36a18e4fa81901546d9
2017-05-30 23:57:40 +00:00
Treehugger Robot 45d0cbf00b Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." 2017-05-30 23:56:34 +00:00
Tom Cherry 6d2a27768d Merge "init: allow ':' in property names"
am: af95ecdb04

Change-Id: I0f7343072b365cc8cb46f231596f12ec945cee79
2017-05-30 23:53:37 +00:00
Tom Cherry af95ecdb04 Merge "init: allow ':' in property names" 2017-05-30 23:43:28 +00:00
James Hawkins 0bc4ad479a bootstat: Log factory_reset_boot_complete separately from ota_*.
Bug: 37164359
Test: none
Change-Id: I7ed68e299846050fdffa58db8d2bd35fe4599dbb
2017-05-30 15:03:15 -07:00
Tom Cherry 1369379e33 init: allow ':' in property names
Bug: 62114389
Test: boot bullhead, get/set properties with ':' via command line
Test: trigger an init trigger with a property containing a ':'
Change-Id: Ib51853a1ef9d4f79d510c8175c0d9684e2025e23
2017-05-30 13:45:28 -07:00
Sebastian Pop 8b44403ad6 Merge "add a performance benchmark for libziparchive" am: f8e96ea2d1
am: 48a6049eca

Change-Id: I6667e494ac8cbca9663294e656344638b92f8c64
2017-05-30 19:57:53 +00:00
Sebastian Pop 48a6049eca Merge "add a performance benchmark for libziparchive"
am: f8e96ea2d1

Change-Id: I976683a9f9a468a171810eb837879de11e2ac953
2017-05-30 19:53:52 +00:00
Treehugger Robot f8e96ea2d1 Merge "add a performance benchmark for libziparchive" 2017-05-30 19:44:52 +00:00
Sandeep Patil 485f5b606d Merge "Respect that status property when parsing fstab from device tree" am: ea043a1d43
am: faad4c62f8

Change-Id: If3523d7fd0ff91ee727bb3f021ce2c5c3739e0b6
2017-05-30 19:21:54 +00:00
Sandeep Patil faad4c62f8 Merge "Respect that status property when parsing fstab from device tree"
am: ea043a1d43

Change-Id: Id23c5509001726781778721e7adb5b20a71fd407
2017-05-30 19:17:52 +00:00
Treehugger Robot ea043a1d43 Merge "Respect that status property when parsing fstab from device tree" 2017-05-30 19:11:08 +00:00
Yueyao Zhu d89f523bdf Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" am: 8418634e70
am: 93e6339613

Change-Id: Idb97d7108e8c750739943b991a2468f3aa87fc83
2017-05-30 18:46:20 +00:00
Yueyao Zhu 93e6339613 Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc"
am: 8418634e70

Change-Id: I3848c66092e8f7f89e80697991df92a08a71e5ed
2017-05-30 18:42:20 +00:00
Treehugger Robot 8418634e70 Merge "init.rc: import /vendor/etc/init/hw/init.${ro.hardware}.rc" 2017-05-30 18:33:08 +00:00
Sebastian Pop 0a94c56463 add a performance benchmark for libziparchive
This patch adds two benchmarks that measure the performance of some
operations of libziparchive.

Both benchmarks are creating a temporary zip file containing file
names of uniformly distributed lengths.  The creation of the zip
file is not timed in the benchmarks.

- FindEntry_no_match tries to find an inexisting entry in the files
  of the zip archive, in order to force the code to examine all the
  files in the archive.

- Iterate_all_files uses the iterate function to list all the files
  in the archive.

Bug: N/A
Test: adb shell /data/ziparchive-benchmarks
Change-Id: Ibdb524ba1c5ae55caddf0416ebbc09f8b6df0021
2017-05-30 10:50:14 -07:00
Sandeep Patil 02a5108308 Respect that status property when parsing fstab from device tree
For an fstab entry in device tree, fs_mgr now honors the status property
as done by linux. i.e. the node (in this case, the fstab entry) is
enabled if status is not set, "ok" or "okay". For every other value, the
node is considered as disabled.

Merged-In: I5ff8f710de2c54afc76b4af28108ca9075357ad1
Bug: 62127741
Test: Test sailfish w/ no status property, result: boots
Test: Test with status = "disabled", result: skips mounting /vendor
Test: Test with status = "ok", result: boots

Change-Id: I5ff8f710de2c54afc76b4af28108ca9075357ad1
Signed-off-by: Sandeep Patil <sspatil@google.com>
(cherry picked from commit be4302bf58)
2017-05-30 10:25:58 -07:00
George Burgess IV 41ed46f9b4 Merge "logging: always enable DCHECK for the static analyzer" am: 844940d751
am: 539c87b29a

Change-Id: I351610d18f877e8b81e7a61a0b26191771671cdf
2017-05-26 21:27:00 +00:00
George Burgess IV 539c87b29a Merge "logging: always enable DCHECK for the static analyzer"
am: 844940d751

Change-Id: Idf8c288d453ce24769eccb7296fe44b9df683254
2017-05-26 21:25:00 +00:00
Treehugger Robot 844940d751 Merge "logging: always enable DCHECK for the static analyzer" 2017-05-26 21:16:49 +00:00
George Burgess IV 7e771de38f logging: always enable DCHECK for the static analyzer
This helps us have less false-positives.

We do this instead of `#undef NDEBUG`, since undefing NDEBUG actually
gave us more false-positives (...and build breakages) than simply
leaving it defined.

Bug: None
Test: Ran the static analyzer across internal master. 213 fewer warnings
(15 Medium, 2 Low, the remainder are 'Analyzer'). All of the dropped
warnings I audited were false-positives. It adds ~3 Tidy warnings.
Change-Id: Ibedab60ca7e9d2b0772896222b83d2e7ab064afe
2017-05-26 11:04:48 -07:00
Tom Cherry cc0e43c8dd Merge "ueventd: Break devices.cpp into discrete classes" am: c495e059b7
am: 18d0144e6c

Change-Id: Ia7a22c5856fcae4f0c75220118f60d0f20a3bb60
2017-05-26 00:19:37 +00:00
Tom Cherry 18d0144e6c Merge "ueventd: Break devices.cpp into discrete classes"
am: c495e059b7

Change-Id: I0ada340d4b422750fae7ec362834f48bc729789a
2017-05-26 00:16:44 +00:00
Tom Cherry c495e059b7 Merge "ueventd: Break devices.cpp into discrete classes" 2017-05-25 23:51:49 +00:00
Tom Cherry ed506f7356 ueventd: Break devices.cpp into discrete classes
devices.cpp handles too many things for creating one class.  This
change breaks it up into various files and classes.

* Parsing is moved to ueventd_parser.cpp
* Reading from the uevent socket and Cold booting is moved to a
  UeventListener class, in uevent_listener.cpp
* Firmware handling is moved to firmware_handler.cpp
* The remaining contents form a DeviceHandler class within devices.cpp

Bug: 33785894

Test: boot bullhead x40, observe no major differences in /dev and /sys
Test: boot sailfish x40, observe no major differences in /dev and /sys
Test: init unit tests

Change-Id: I846a2e5995fbb344c7a8e349065c18a934fa6aba
2017-05-25 16:17:19 -07:00
Dan Willemsen 60d2f533e2 Merge "Fix warning on the build servers" am: 7b45384a7a
am: 2968e8c28a

Change-Id: Id469da9b4370b21a2ece0e0c8cef1abc3300a04c
2017-05-25 21:37:24 +00:00
Dan Willemsen 2968e8c28a Merge "Fix warning on the build servers"
am: 7b45384a7a

Change-Id: Ieec42af50addac8a23997b830c8b4b0deff727cb
2017-05-25 21:32:23 +00:00
Treehugger Robot 7b45384a7a Merge "Fix warning on the build servers" 2017-05-25 21:21:45 +00:00