Commit Graph

56728 Commits

Author SHA1 Message Date
Treehugger Robot cb57583949 Merge "adb: don't hardcode ports in test_adb." 2020-02-28 02:56:48 +00:00
Automerger Merge Worker 9a2960f209 Merge "String8: operator<<" am: 3c22033c72
Change-Id: Ib74439d696a56a609abe529bcc29aedd399fc45d
2020-02-27 23:22:51 +00:00
Steven Moreland 3c22033c72 Merge "String8: operator<<" 2020-02-27 23:18:49 +00:00
Automerger Merge Worker 3a20e8a179 Merge "If userspace reboot watchdog triggers, don't store reason in persistent property" am: 18a65319fd
Change-Id: I749cfd4707022a5573e61281dd40edf95755892b
2020-02-27 23:14:42 +00:00
Nikita Ioffe 18a65319fd Merge "If userspace reboot watchdog triggers, don't store reason in persistent property" 2020-02-27 23:01:53 +00:00
Josh Gao e8829c6bfc adb: don't hardcode ports in test_adb.
If we get unlucky and something else (or ourselves, in another thread)
beats us to listening on our hardcoded ports, we can deadlock.

Bug: http://b//149829737
Test: ./test_adb.py
Change-Id: I8f14004a6b2e77366abad6e88786ea8941629020
2020-02-27 14:30:35 -08:00
Josh Gao e3d34e1f8b adbd: add usb thread spawn logging.
Bug: http://b/141959374
Test: adbd shell killall adbd; adb wait-for-device logcat | grep UsbFfs
Change-Id: Id5bbfd6d2198005bf10b94c691499059e130afe7
2020-02-27 13:56:48 -08:00
Josh Gao 891e6dad73 base: add CachedProperty.
Copy bionic's CachedProperty with some minor API tweaks, to allow for
efficient querying of properties that rarely change.

Bug: http://b/141959374
Test: treehugger
Change-Id: I4dfc3f527d30262b35e871d256cec69e69f2e1d7
2020-02-27 13:56:48 -08:00
Nikita Ioffe 3ad292025c Reset post_data_ and services_update_finished_ on userspace reboot
Test: adb reboot userspace
Bug: 143970043
Change-Id: I77d47a8460b1526337a318547a59141334e11cdd
2020-02-27 20:46:27 +00:00
Automerger Merge Worker 6796954be6 Merge "libsnapshot/test: Re-enable the failing tests" am: 4bd1f92e0b
Change-Id: I058829bee51069091267060279be311a12a962b2
2020-02-27 17:59:59 +00:00
Treehugger Robot 4bd1f92e0b Merge "libsnapshot/test: Re-enable the failing tests" 2020-02-27 17:42:38 +00:00
Automerger Merge Worker c0d3b5c2b8 Merge "Revert "liblog: disable header_abi_checker"" am: 3638096424
Change-Id: Ie4c67bff24a1cb293c4f500dc84584458890d4ff
2020-02-27 16:52:44 +00:00
Tom Cherry 3638096424 Merge "Revert "liblog: disable header_abi_checker"" 2020-02-27 16:39:43 +00:00
Nikita Ioffe d485bbbb51 If userspace reboot watchdog triggers, don't store reason in persistent property
If init is wedged, then the write will never succeed and reboot won't
happen.

Also, in case of normal reboot, move call to PersistRebootReason to the
top of DoReboot() function, to make sure we persist it even if /data is
not mounted.

Test: builds
Test: adb shell svc power reboot userspace
Test: atest CtsUserspaceRebootHostSideTestCases
Bug: 148767783
Change-Id: I4ae40e1f6fdc41cc0bcae57020fa3d3385dda1b4
2020-02-27 13:06:37 +00:00
Automerger Merge Worker 3d9c20fefd Merge "Always use shared memory for atrace." am: 2ddc5a1932
Change-Id: I178514bd3d57cd406f2e243a1856a2a13d0326f8
2020-02-27 10:49:04 +00:00
Florian Mayer 2ddc5a1932 Merge "Always use shared memory for atrace." 2020-02-27 10:36:48 +00:00
Howard Chen 2e1c6b26a1 Refine the exported DSU status
The new exported DSU status removes the need to make blocking binder
calls out of system server during device boot.

Bug: 149790245
Bug: 149716497
Test: adb shell am start-activity \
    -n com.android.dynsystem/com.android.dynsystem.VerificationActivity \
    -a android.os.image.action.START_INSTALL \
    -d file:///storage/emulated/0/Download/system.raw.gz \
    --el KEY_SYSTEM_SIZE $(du -b system.raw|cut -f1) \
    --el KEY_USERDATA_SIZE 8589934592
Change-Id: I27fae316214498407a73474ca8b93aec3518e4b5
2020-02-27 16:34:30 +08:00
Automerger Merge Worker c70004f863 Merge "logwrap: add missing O_CLOEXEC" am: f2e5b4bade
Change-Id: Ic4a317e13af407861b2aba51d017f2bfa9b9a6d8
2020-02-27 05:38:37 +00:00
Tom Cherry f2e5b4bade Merge "logwrap: add missing O_CLOEXEC" 2020-02-27 05:25:47 +00:00
Automerger Merge Worker 807edd3e5c Merge "init: prevent persist.sys.usb.config initalized as none,adb" am: 78464a0337
Change-Id: Ib903adce0ac6ed502c595dac670b5c7ec1d84963
2020-02-27 04:08:12 +00:00
Treehugger Robot 78464a0337 Merge "init: prevent persist.sys.usb.config initalized as none,adb" 2020-02-27 03:48:44 +00:00
Automerger Merge Worker eacb8dd031 Merge "Use optional for nullable types" am: 0e49bfa809
Change-Id: I0a4adc474ad910bb24a7ebbed6a4c6e3f9862128
2020-02-27 03:22:55 +00:00
Jooyung Han 0e49bfa809 Merge "Use optional for nullable types" 2020-02-27 03:06:14 +00:00
Jiyong Park 49c3dc51c7 Mark updatable APEXes
Mark updatable APEXes as updatable: true so that they are opted-out from
optimizations that make sense only for non-updatable modules; such as
symlinking to the libs in the system partition.

Bug: 149805758
Test: m and check that there is no symlink from the APEX to the system
partition.

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: Ic3edc7e285e9eafbdaa20b18ccbc0b2231370779
(cherry picked from commit 7c2ae1f02c)
Change-Id: Ic3edc7e285e9eafbdaa20b18ccbc0b2231370779
2020-02-27 10:52:47 +09:00
Automerger Merge Worker d5fd1b7e86 Merge "Mark fs-verity support for ext4 userdata if first_api_level >= R" am: b03ff7dbbf
Change-Id: If72620a065d2ae33a5a40bd28b04d3758ffbe6b5
2020-02-27 00:38:37 +00:00
Treehugger Robot b03ff7dbbf Merge "Mark fs-verity support for ext4 userdata if first_api_level >= R" 2020-02-27 00:26:15 +00:00
Howard Yen bb578203a6 init: prevent persist.sys.usb.config initalized as none,adb
Prevent appending ",adb" to persist.sys.usb.config if "none" is
explicitly defined in default prop.

Bug: 150130503
Test: persist.sys.usb.config initalized correctly
Change-Id: I3b5de6fd102e252019e843f39f0875f5aaea7486
Merged-In: I3b5de6fd102e252019e843f39f0875f5aaea7486
2020-02-27 07:53:48 +08:00
Automerger Merge Worker 06f8bd9e37 Merge "fs_mgr: fix checking for casefold feature already enabled" am: 154bd7e031
Change-Id: I3c23d4bc78dca61397e4720dfe4752fcb570fef5
2020-02-26 23:41:35 +00:00
Treehugger Robot 154bd7e031 Merge "fs_mgr: fix checking for casefold feature already enabled" 2020-02-26 23:37:34 +00:00
Automerger Merge Worker 5a04435a63 Merge "trusty: keymaster: Remove legacy support" am: 23ba0d425e
Change-Id: I1f37917b3e58864a6630d0804426df81940df866
2020-02-26 23:36:58 +00:00
David Anderson 940c6b26ef libdm: Fix WaitForFile early-returning on failed accesses.
WaitForFile/WaitForDeletedFile both early return true if an error like
EPERM occurs. This was intentional because the code was modeled off
earlier fs_mgr code, but it makes libdm inherently racy if sepolicy is
not configured correctly. It's better to have these result in explicit
and consistent failures.

Bug: 148103327
Test: fastboot flashall
Change-Id: I0c78818962e1db91b556e523c418db28f7d78fae
Merged-In: I0c78818962e1db91b556e523c418db28f7d78fae
2020-02-26 15:21:53 -08:00
Matthew Maurer 23ba0d425e Merge "trusty: keymaster: Remove legacy support" 2020-02-26 23:19:27 +00:00
Alessio Balsini e7f1087fa1 libsnapshot/test: Re-enable the failing tests
Some tests were temporarily disabled due to errors in Cuttlefish.
Now that the issues were fixed, the tests can be put back in presubmit.

Bug: 148889015
Test: vts_libsnapshot_test (Cuttlefish + Pixel 4)
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Idcb2b7831b2183b2d734bdf8821fd34746f2beee
2020-02-26 21:49:25 +00:00
Tom Cherry cfcf684c83 Revert "liblog: disable header_abi_checker"
All planned changes to liblog have been made, so it's time to
re-enable this.

This reverts commit 896fb9e57a.

Test: build
2020-02-26 13:43:31 -08:00
Eric Biggers 91bcfd8d7f fs_mgr: fix checking for casefold feature already enabled
EXT4_FEATURE_INCOMPAT_CASEFOLD is a flag in s_feature_incompat, not in
s_feature_ro_compat.

Bug: 138322712
Test: Treehugger
Change-Id: I07bb1d2b818d423196d8ceebda8900a8adbb19e9
2020-02-26 19:11:48 +00:00
Tom Cherry b5b162e204 logwrap: add missing O_CLOEXEC
Bug: 150260863
Test: build
Change-Id: Ibe070d5d4f3a7ada0718f74c7cee12db7b9f920e
2020-02-26 10:29:04 -08:00
Automerger Merge Worker 6123c646ec Merge "String*: remove 'StaticLinkage' constructor" am: 8ef1e1b535
Change-Id: I0edc1e5a4bacb989a24836054f8411aedb21b764
2020-02-26 18:08:49 +00:00
Automerger Merge Worker 6feb036bbb Merge "init: Make sure ImageManager status files are labelled." am: a31834a4b6
Change-Id: Iad6fc15e10ffa0bcb437b646f27e208832806abc
2020-02-26 18:08:41 +00:00
Steven Moreland 8ef1e1b535 Merge "String*: remove 'StaticLinkage' constructor" 2020-02-26 17:57:07 +00:00
David Anderson a31834a4b6 Merge "init: Make sure ImageManager status files are labelled." 2020-02-26 17:56:03 +00:00
Victor Hsieh 98296fcf2a Mark fs-verity support for ext4 userdata if first_api_level >= R
fs-verity is required for new devices launched with R. This change
remove a manual setup for vendors going forward. The original fs mgr
flag still allows old devices to opt in, which can only to be done
manually because of kernel dependency.

Test: build
Bug: 150034150
Change-Id: I152b63d7889153d41f29677f72074afb1881b65d
2020-02-26 09:49:45 -08:00
Florian Mayer fc0adaf89e Always use shared memory for atrace.
Remove ATRACE_SHMEM macro.

Test: atrace ss
      atrace wm
      sanity check output
Bug: 137366208
Change-Id: I1b42243678b9b9a41db18e2ff8cb3cf7bde874de
2020-02-26 15:55:22 +00:00
Steven Moreland b1d3161b7b String8: operator<<
For parity with String16.

Bug: N/A
Test: N/A
Change-Id: I2d7d207138c96146814da31cf27a49cc310e5362
2020-02-25 17:59:54 -08:00
Matthew Maurer 1010727a48 trusty: keymaster: Remove legacy support
Library based HALs have been deprecated for several years now, and
Keymaster 2 based testing is woefully out of date compared to running
VTS against the modern 3.0 and 4.0 implementations.

Purging these modules and their resulting dependencies will make it
easier for the central system/keymaster repository to move forwards.

Test: mm
Bug: 150239636
Change-Id: Ic2ddbe685a50e65f9db25f682ad33105195efa8a
2020-02-26 00:43:23 +00:00
Elliott Hughes 530ab81e42 debuggerd: add an opt-out for OEMs that would rather collect core dumps.
On userdebug/eng devices, check a system property to see whether we
should create tombstones or not. OEMs that would rather have core dumps
can set this property and configure /proc/sys/kernel/core_pattern
appropriately.

Bug: https://issuetracker.google.com/149663286
Test: set the property, cause a crash
Change-Id: If894b4582a1820b64bdae819cec593b7710cb6e3
2020-02-25 09:28:24 -08:00
David Anderson c991f347b2 init: Make sure ImageManager status files are labelled.
adb remount and snapshot-based updates use ImageManager in first-stage
init. This creates status files, which need to be labelled.

Bug: 148834619
Test: manual test
Change-Id: I72949fca2889f9e5612049844a78bf9355b48797
2020-02-25 09:09:08 -08:00
Automerger Merge Worker f8f993ad1f Merge "fs_mgr: use "-T now" for tune2fs" am: 7ef2b1d853
Change-Id: I188eb32d57db668312dc17efe0705df4b6706665
2020-02-25 16:46:04 +00:00
Jaegeuk Kim 7ef2b1d853 Merge "fs_mgr: use "-T now" for tune2fs" 2020-02-25 16:38:25 +00:00
Automerger Merge Worker 30b1faf6b0 Merge "init: handle property service callbacks asynchronously" am: 0fcb22868d
Change-Id: I55e9e89e00990d9da749881b503d632e491d360b
2020-02-25 16:26:33 +00:00
Automerger Merge Worker 13c39d7963 Merge "logd: don't coalesce identical log messages in the security buffer" am: 9d04b677e3
Change-Id: I3de2f6302cf15c99d7bf779c5199a83c3c47a0cc
2020-02-25 16:26:16 +00:00