Commit Graph

39227 Commits

Author SHA1 Message Date
Tom Cherry e053c09f8d Merge "init: add TODO for mount operations."
am: 94e9305511

Change-Id: I11e757937b08e1a8e1457c068fa4c2f5ebc91f4e
2018-02-05 18:17:59 +00:00
Treehugger Robot 94e9305511 Merge "init: add TODO for mount operations." 2018-02-05 18:08:10 +00:00
Mark Salyzyn 0c071c9de7 base: adb.exe build error
Windows build of adb is broken because of the lack of
std::chrono_literals and for an implementation of
android::boot_clock::now().

Test: make -j vts
Bug: 72941624
Change-Id: Ie65fed098633eb45a94ea553de6903f8d55fc5b2
2018-02-05 09:33:10 -08:00
Tom Cherry 880d566400 init: add TODO for mount operations.
mount operations should be done in vendor init context, but their
complexity currently limits this.  Add a TODO to make this reason
clear to those viewing the code.

Bug: 72488820
Test: N/A
Change-Id: I8b6dd92aa79f31dc24603559ed6de0815facfcba
2018-02-05 08:01:54 -08:00
bohu 466b098b87 Merge "emulator: not start adbd upon ro.kernel.qemu=1"
am: 7c271bdc3b

Change-Id: I7277a43dfebc01d8e9ef7a9c39cd8dd7b9633c9b
2018-02-05 06:32:48 +00:00
Treehugger Robot 7c271bdc3b Merge "emulator: not start adbd upon ro.kernel.qemu=1" 2018-02-05 06:27:57 +00:00
bohu b40193e50a emulator: not start adbd upon ro.kernel.qemu=1
clean up emulator specific rules.

BUG: 72900827

Change-Id: Ica60838562fd773bcde5752c11586183ce55b71a
2018-02-03 17:22:15 -08:00
David Srbecky 82aecc3b52 Merge "Load dex files from ART-specific data structure."
am: 7f5615e8d4

Change-Id: I26d5eb21c492087128fa0528c39b5531a33abfe4
2018-02-03 11:35:21 +00:00
David Srbecky 7f5615e8d4 Merge "Load dex files from ART-specific data structure." 2018-02-03 11:29:38 +00:00
yusukes 495a672f4c Merge "Do not block SIGTERM in init's child processes"
am: 176afbbedf

Change-Id: I26bcb38bf2082da18e753afe5761b6c0460fc85c
2018-02-03 04:19:18 +00:00
Treehugger Robot 176afbbedf Merge "Do not block SIGTERM in init's child processes" 2018-02-03 01:31:45 +00:00
yusukes 4a4ec14e42 Do not block SIGTERM in init's child processes
Previously, unless the process unblocks the signal by itself,
the signal was never delivered to the process. This caused at
least one CTS test failure.

Bug: 72453675
Test: 'kill -TERM app_pid' terminates the app process

Change-Id: I3977cac75e2673b52c5cf91d34d7a9c258c1a0e4
2018-02-02 15:28:03 -08:00
Christopher Ferris 7747b60faa Load dex files from ART-specific data structure.
Fixes cdex which was recently changed to have shared data section,
which means the DEX PC cannot be used to find the right symbol,
as the bytecode is no longer within the dex file, and in-fact,
we might have to scan multiple dex files to find the method.

Bug: 72520014
Test: testrunner.py --host --cdex-none -t 137
Test: testrunner.py --host --cdex-fast -t 137
Test: All unit tests pass.
Change-Id: I80265d05ad69dd9cefbe3f8a75e4cd349002af5e
2018-02-02 15:03:00 -08:00
Paul Crowley fcc1db2189 Merge "Use vold's mount with metadata encryption service."
am: 4819edf4fc

Change-Id: I2bbde4166977723d5fde93d844d41bc244ccbb3d
2018-02-02 04:01:10 +00:00
Christopher Ferris 4132278874 Merge "Fix symbol resolution within a dex file."
am: 0ce76f910b

Change-Id: I2cf800172e5e0a07e8b084e3176215ba4c96b3d2
2018-02-02 04:00:45 +00:00
Treehugger Robot 4819edf4fc Merge "Use vold's mount with metadata encryption service." 2018-02-02 01:16:29 +00:00
Paul Crowley c684696a96 Use vold's mount with metadata encryption service.
Don't use the FDE flow to support metadata encryption; just use the
vold service which directly mounts the volume.

Bug: 63927601
Test: Boot Taimen to SUW with and without metadata encryption.
Change-Id: Idf9c27a69872cd7a9e2fb76df09a91d8e5ef4896
2018-02-01 14:54:04 -08:00
Christopher Ferris 0ce76f910b Merge "Fix symbol resolution within a dex file." 2018-02-01 18:35:00 +00:00
David Srbecky f9006ec9b6 Fix symbol resolution within a dex file.
Fixes the ART 137-cfi test, currently failing on buildbot.

Test: testrunner.py -j40 --host --cdex-none -t 137 -b
Change-Id: I16a007b291702207bbd003fd1e78e8e5ced7cd68
2018-02-01 14:51:57 +00:00
Christopher Ferris d790cad91d Merge "Move dex pc frame creation into libunwindstack."
am: c146c8f5c1

Change-Id: I0ec42acb7eb33c41207d2e754af019b8e5193b02
2018-02-01 00:36:22 +00:00
Christopher Ferris c146c8f5c1 Merge "Move dex pc frame creation into libunwindstack." 2018-02-01 00:32:47 +00:00
Jaekyun Seok bd1670f24d Merge "Update stable_properties.h"
am: 5e041a4f45

Change-Id: I980ffc21ac8ae0b99412befcc7a4249832666471
2018-02-01 00:15:39 +00:00
Treehugger Robot 5e041a4f45 Merge "Update stable_properties.h" 2018-01-31 23:59:08 +00:00
Christopher Ferris d70ea5ea85 Move dex pc frame creation into libunwindstack.
Test: Compiles, all unit tests pass.
Test: Ran 137-cfi art test in interpreter and verified interpreter
Test: frames still show up.

Change-Id: Icea90194986faa733a873e8cf467fc2513eb5573
2018-01-31 14:19:42 -08:00
Josh Gao 99500f1e3b Merge changes I877b8027,I469bd931
am: 8848052c9f

Change-Id: I38f835416bc301303912b41fa7f512a5d8a6d50b
2018-01-31 21:45:47 +00:00
Josh Gao 8848052c9f Merge changes I877b8027,I469bd931
* changes:
  adb: extract atransport's connection interface.
  adb: fix a leak.
2018-01-31 21:34:53 +00:00
Mark Salyzyn 9f3a257536 Merge "libcutils: test: increase use of ashmem_valid(fd)"
am: dd218e6c84

Change-Id: Ibc4ad78088a81a0f8652e679dec7ba8537a8c0df
2018-01-31 17:44:10 +00:00
Treehugger Robot dd218e6c84 Merge "libcutils: test: increase use of ashmem_valid(fd)" 2018-01-31 17:35:29 +00:00
Jaekyun Seok cf2da29d66 Update stable_properties.h
ro.boot.* are from kernel cmdline, and kernel is usually owned by SoC
vendor or ODM.
So those properties should be allowed as action triggers of
vendor/odm init scripts.

Additionally the state of mediadrm (/system/bin/mediadrmserver) should
be used to operate the state of drm HAL.
So init.svc.mediadrm should be whitelisted as an action trigger as well.

Bug: 36796459
Test: tested with walleye
Change-Id: Ic9f68162c577cc190f193063988ad04e42478e6e
2018-01-31 21:47:09 +09:00
Josh Gao b800d88b34 adb: extract atransport's connection interface.
As step one of refactoring atransport to separate out protocol handling
from its underlying connection, extract atransport's existing
hand-rolled connection vtable out to its own abstract interface.

This should not change behavior except in one case: emulators are
now treated as TCP devices for the purposes of `adb disconnect`.

Test: python test_device.py, with walleye over USB + TCP
Test: manually connecting and disconnecting devices/emulators
Change-Id: I877b8027e567cc6a7461749432b49f6cb2c2f0d7
2018-01-30 15:22:41 -08:00
Paul Crowley 2fc40a6518 Merge "Don't initialize atrace if it's already disabled."
am: 0e239bbd8b

Change-Id: I3839188718fe70fb6e0bb94aacd2dc8de7612654
2018-01-30 21:44:10 +00:00
Josh Gao fb413a2304 adb: fix a leak.
Test: none
Change-Id: I469bd93180cd2a8b6408f73e8c8f164f72b3345c
2018-01-30 13:32:38 -08:00
Treehugger Robot 0e239bbd8b Merge "Don't initialize atrace if it's already disabled." 2018-01-30 20:40:19 +00:00
Paul Crowley e184423526 Don't initialize atrace if it's already disabled.
For processes that start very early, atrace initialization can cause
an selinux denial, so make sure it's possible to disable it and avoid
the call to open "trace_marker".

Bug: 63927601
Test: disable atrace early in vold, ensure that selinux denial is
avoided.

Change-Id: I2422e6d0db323bc13c6d6ed1896435151fca21f7
2018-01-30 08:18:24 -08:00
Christopher Ferris 1a3f73c586 Merge "Use new unwinder for offline in libbacktrace."
am: 01ba115732

Change-Id: Ib5c0bc398ab1788ddc5ec1bd49fab3516da2fe8d
2018-01-30 15:44:36 +00:00
Christopher Ferris 01ba115732 Merge "Use new unwinder for offline in libbacktrace." 2018-01-30 15:33:56 +00:00
Christopher Ferris c8bec5aa91 Use new unwinder for offline in libbacktrace.
libbbacktrace changes:
- Completely rewrite the BacktraceOffline class to use the new unwinder.
- Modify the test data to save ucontext_t data instead of unw_context data.
- Convert the previous tests from unw_context data to ucontext_t data.

Bug: 65682279

Test: New unit tests pass in libunwindstack.
Test: All offline tests continue to pass.
Change-Id: I540345c304b20199d46deeb0349a0638a0f3ab2f
2018-01-29 10:41:11 -08:00
Bowgo Tsai 9714474d65 Merge "sepolicy: renames nonplat_* to vendor_*"
am: 8abe4e2638

Change-Id: I8c568c92912348f1c90ac4477e043926ba2b384d
2018-01-28 02:43:08 +00:00
Treehugger Robot 8abe4e2638 Merge "sepolicy: renames nonplat_* to vendor_*" 2018-01-28 02:39:28 +00:00
Christopher Ferris 7cbaae26ed Merge "Fix frame numbering regression."
am: 91837d7efe

Change-Id: I406f8fc76b8097cd05aa44946c56774c3745e68f
2018-01-27 00:39:02 +00:00
James Hawkins f609df2475 Merge "bootstat: Add more boot reasons."
am: 4b69be3013

Change-Id: I794f18767a8f5fe759f1c5e659f30cc365b34172
2018-01-27 00:38:34 +00:00
Christopher Ferris 91837d7efe Merge "Fix frame numbering regression." 2018-01-27 00:30:43 +00:00
Treehugger Robot 4b69be3013 Merge "bootstat: Add more boot reasons." 2018-01-27 00:27:26 +00:00
Elliott Hughes 3d9706ea36 Merge "Doxygen format <android/log.h>."
am: 969539c5c8

Change-Id: I4a8f17d666da7084790b99d79fcd289896416f45
2018-01-27 00:01:24 +00:00
James Hawkins 79a4ee260b bootstat: Add more boot reasons.
Bug: none
Test: none
Change-Id: I483e4e2c6ea4219ac21b64a24bfac58c2919a40b
2018-01-26 14:31:04 -08:00
Christopher Ferris 8fe5836c02 Fix frame numbering regression.
Test: All unit tests now pass.
Change-Id: I280dfbbed3f835c826788b80ff4abb22bea7dc59
2018-01-26 14:26:13 -08:00
Elliott Hughes 969539c5c8 Merge "Doxygen format <android/log.h>." 2018-01-26 21:23:09 +00:00
Ruchi Kandoi 66c3eb0e45 Merge "Add AID for Secure Element Application"
am: d3e7e31d28

Change-Id: I7b5fc105e82956751faa29a39dccd85a633adef8
2018-01-26 19:38:25 +00:00
Ruchi Kandoi d3e7e31d28 Merge "Add AID for Secure Element Application" 2018-01-26 19:17:09 +00:00
Elliott Hughes 65725ac464 Doxygen format <android/log.h>.
Bug: N/A
Test: ran doxygen manually.
Change-Id: I164de255dbbc6c0312e656ddd886dcac231c893a
2018-01-26 10:57:57 -08:00