Commit graph

67955 commits

Author SHA1 Message Date
David Anderson
d380da2e68 Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." am: 291a5058cb am: 0bfda0923b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic09fbc4dc3c82d85ea89fb42404b79a7c3c18892
2021-01-25 21:55:39 +00:00
David Anderson
0bfda0923b Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." am: 291a5058cb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556787

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id85062432b90ab4bb4e283e50790b50a772d412c
2021-01-25 21:35:08 +00:00
David Anderson
291a5058cb Merge "libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest." 2021-01-25 21:00:40 +00:00
Mitch Phillips
0a6a89d04f Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a am: 9951b2fa1a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1a84f7f3ab171ee86376c9743c478501b3d31e62
2021-01-25 17:56:37 +00:00
Mitch Phillips
9951b2fa1a Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." am: 1d792bf90a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556425

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7daa6d13eefce2cf48ae0bde64fd8d55ef8b8aa8
2021-01-25 17:45:53 +00:00
Mitch Phillips
1d792bf90a Merge "[MTE] Cleanup tagged si_addr refs to fix mappings OOB bug." 2021-01-25 17:20:40 +00:00
Bowgo Tsai
074c8f348e Merge "libfs_avb: Fix unit test failures" am: 38de3ba65f am: d46d8d9e8e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic46031fd99550d4be5d2709af796a04f434774a7
2021-01-25 11:09:19 +00:00
Bowgo Tsai
d46d8d9e8e Merge "libfs_avb: Fix unit test failures" am: 38de3ba65f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1557540

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1251698ebe6d8c20b6f8413d6cece4a1f19cc05
2021-01-25 10:32:29 +00:00
Bowgo Tsai
38de3ba65f Merge "libfs_avb: Fix unit test failures" 2021-01-25 10:13:25 +00:00
Bowgo Tsai
8e491dced4 Merge "Mark libvbmeta_test as not unit tests" am: 8d84d08da6 am: 42da52aae6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I58ab41f5e560eeeb75ddbe53162f3a0db16b034d
2021-01-25 09:40:02 +00:00
Bowgo Tsai
42da52aae6 Merge "Mark libvbmeta_test as not unit tests" am: 8d84d08da6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1558427

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ad2455c1a416b169a1f04e39ada691b8dee5e65
2021-01-25 09:11:44 +00:00
Bowgo Tsai
8d84d08da6 Merge "Mark libvbmeta_test as not unit tests" 2021-01-25 08:43:18 +00:00
Bowgo Tsai
708d962795 libfs_avb: Fix unit test failures
There more output lines of `avbtool` now, adjusts the expected
output of `avbtool info_image --image test.img` in the test
cases.

Bug: 178215452
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Change-Id: I924d6d97ef0a4c19c93017c2491bf251dfc51cae
2021-01-25 16:19:03 +08:00
Seigo Nonaka
d8f86dfcf1 Merge "Set up /data/fonts directory for updatable system fonts" am: 4356f6e98d am: 922eb5b4fd
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1502269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ae14defa17f1a432f3a45ad9bbe8bba2a894ce4
2021-01-25 06:27:40 +00:00
Seigo Nonaka
922eb5b4fd Merge "Set up /data/fonts directory for updatable system fonts" am: 4356f6e98d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1502269

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie3ac38a3b435336949170af9b6df2295df527668
2021-01-25 06:11:58 +00:00
Seigo Nonaka
4356f6e98d Merge "Set up /data/fonts directory for updatable system fonts" 2021-01-25 05:47:03 +00:00
Yo Chiang
2f345e760c Merge "adb remount -R should enable DSU if suitable" am: 8d60fefae8 am: 2099999a11
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553825

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8d96fa963c456a9b2c9eb5359afc7ba83df8a9e
2021-01-25 00:23:10 +00:00
Yo Chiang
2099999a11 Merge "adb remount -R should enable DSU if suitable" am: 8d60fefae8
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553825

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3e0501a47987514ff033a6d5e807a2f3c1e8bc5
2021-01-24 23:58:35 +00:00
Yo Chiang
8d60fefae8 Merge "adb remount -R should enable DSU if suitable" 2021-01-24 23:38:28 +00:00
Linzhao Ye
9899a64f52 Merge "Allow system server to access sysfs node of led lights." am: 5a9b8577c9 am: d0399c1ff9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ife85aafc2d5a4babbfe1bcaa7bf143d8dfd41582
2021-01-23 18:02:27 +00:00
Linzhao Ye
d0399c1ff9 Merge "Allow system server to access sysfs node of led lights." am: 5a9b8577c9
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1546377

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9f5dd0f8de9634baebe937c2b6f4a28aa04cf48d
2021-01-23 17:25:46 +00:00
Linzhao Ye
5a9b8577c9 Merge "Allow system server to access sysfs node of led lights." 2021-01-23 17:08:46 +00:00
Woody Lin
568cd24f41 Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" am: 81bf17ce0f am: 1d24da452d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I24d7311db98edd38ae5b58c5943c1f5851b64594
2021-01-23 01:27:57 +00:00
Woody Lin
1d24da452d Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" am: 81bf17ce0f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554980

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iece3de95103e59aa2ce04689f93fa7bdc0cc9801
2021-01-23 01:07:35 +00:00
Woody Lin
81bf17ce0f Merge "Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL" 2021-01-23 00:34:06 +00:00
Elliott Hughes
6f79cbe47e Merge "libadf: delete libadf & libadfhwc" am: ad5b717c5b am: 33073c81b6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556786

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie9f4f5d8d0c75e6408234f74e074183166f6ea6a
2021-01-23 00:15:36 +00:00
Elliott Hughes
33073c81b6 Merge "libadf: delete libadf & libadfhwc" am: ad5b717c5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556786

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idac17b8503f7485e3fb6b51deec33bcfd5e688aa
2021-01-22 23:54:11 +00:00
Elliott Hughes
ad5b717c5b Merge "libadf: delete libadf & libadfhwc" 2021-01-22 23:37:48 +00:00
Marissa Wall
254d753f34 libadf: delete libadf & libadfhwc
libadf is a helper library for adf (android display framework)
kernel drivers. The last Android Common Kernel to support adf was
4.4. Delete this helper library since we do not support any kernels
that can use it.

If a vendor needs this library, they can fork it.

If you have any concerns, please contact adelva@google.com.

Bug: 150467766
Test: Compiles
Change-Id: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255
Merged-In: Ib6e1ce2db016e97a165a59b28b9fab5e3ef8f255
2021-01-22 19:30:47 +00:00
Julien Desprez
3123fd8930 Mark libvbmeta_test as not unit tests
Test: presubmit
Bug: 177906739
Change-Id: I6b49a0af19a652fbe507df2a3f82502a70bec988
2021-01-22 09:04:42 -08:00
Yo Chiang
d542910553 adb remount -R should enable DSU if suitable
If executing `adb remount -R` and DSU is running but disabled, then
enable the DSU (one-shot mode) so that the reboot afterwards would stay
within the DSU guest system.
Normally reboot within a DSU guest system would bring the device back to
the host system. However when doing adb remount -R, we actually doesn't
want to exit DSU, but wish to reboot back into DSU guest system again
with remount machinery (overlayfs) properly set up.

Also sort the header include order.

Bug: 165925766
Test: Within a DSU guest system, DSU disabled, adb remount -R
  => After reboot, system is DSU and overlayfs is mounted
Test: adb-remount-test.sh within DSU guest system
Change-Id: I72a7a568e985b183d357ae6e1a7d0113e9921200
2021-01-22 22:15:10 +08:00
I-Chih Lu
2e6b4f3ad1 Merge "Secure DPU: add folder for common headers" am: e0826c75df am: 6e35140f05
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I931bb4543673fcc9d8cc3878c94dd572bc64737a
2021-01-22 09:19:55 +00:00
I-Chih Lu
6e35140f05 Merge "Secure DPU: add folder for common headers" am: e0826c75df
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1556719

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86421b1ba8e878657afc114dd9eafc7c5819e4cf
2021-01-22 08:47:50 +00:00
I-Chih Lu
e0826c75df Merge "Secure DPU: add folder for common headers" 2021-01-22 08:13:42 +00:00
Woody Lin
ef9d460ea8 Add init.svc_debug.no_fatal.<svc_name> to skip SVC_CRITICAL
For user who would like to retain the crash symptom and avoid device
from power cycle for live debugging, set
init.svc_debug.no_fatal.<svc_name> to "true" to skip FATAL reboot.

Bug: 177593855
Change-Id: I0bdb6191e5963c08e1ea301a60060acf916dd49b
2021-01-22 15:01:36 +08:00
ichihlu
9ee8a75e6b Secure DPU: add folder for common headers
The header SecureDPU.h is moved out from the device specific folder as
it can be shared for different devices.

Bug: 176508588
Test: Pass TUI VTS test on the emulator.
Change-Id: I7695b49c4f7a247b570ced61145471efef3d0a3d
2021-01-22 06:31:37 +00:00
Yo Chiang
0c2693c0de Merge "adb-remount-test.sh: Filter out administrative mount: securityfs" am: f5835fa714 am: f52825ee8d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e2f26348512c8eb07ef4dd03abf78e546da753c
2021-01-22 05:04:48 +00:00
Mitch Phillips
e4adff0721 [MTE] Cleanup tagged si_addr refs to fix mappings OOB bug.
Currently, all MTE failures end up displaying 'Fault address falls at
0x<addr> after any mapped regions'. Clearly when scanning, we should use
the untagged address to figure out which ranges it's in.

I've taken the liberty of removing all si_addr parsing and moving it
into the common ProcessInfo, as well as making it really explicit
whether you want the (possibly tagged) original si_addr, or whether you
want the untagged variant (for scanning /proc/maps or whatever).

This is not particularly easily testable, as ReadCrashInfo isn't easily
injectable and `dump_all_maps` should already be passed the untagged
pointer to scan for. I've tested this locally on FVP under SYNC MTE with
a simple UaF binary and noted the problem is fixed. Given that this is
making the code more clear, I'm hoping the owners see no need for a
regression test :).

Bug: 135772972
Test: On FVP, run 'adb shell MEMTAG_OPTIONS=sync sanitizer-status' and
      check that the use-after-free test ends up with the /proc/maps
      desription in the right place.
Change-Id: I220e4200c75a72474a95a67e5bbc36173a438dd2
2021-01-21 20:49:06 -08:00
Yo Chiang
f52825ee8d Merge "adb-remount-test.sh: Filter out administrative mount: securityfs" am: f5835fa714
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553824

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cdec0ab18b305567b391d4d85800a99fa8d744a
2021-01-22 04:25:00 +00:00
Yo Chiang
f5835fa714 Merge "adb-remount-test.sh: Filter out administrative mount: securityfs" 2021-01-22 03:15:18 +00:00
Yo Chiang
ec8f9dd1f1 adb-remount-test.sh: Filter out administrative mount: securityfs
securityfs /sys/kernel/security securityfs rw,relatime 0 0

is causing the noatime check in adb-remount-test.sh to fail.

Bug: 165925766
Test: Create an aosp_cf_x86_phone-userdebug AVD && adb-remount-test.sh
Test: Use DSU to install GSI on the AVD && adb-remount-test.sh
Change-Id: Ibae0d4bbbbc78fb74f4ad82f2313251598c77f72
2021-01-22 03:15:10 +00:00
David Anderson
04a00de0f6 Merge changes I06043f8e,I872f271c am: 4787c1fa28 am: 6365f57979
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554941

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae7e3d0dc03e5612e240e694dad3021bfdeea34c
2021-01-21 23:54:29 +00:00
David Anderson
b5c2ec8843 Merge "libsnapshot: Removed the unused "linear" optimization." am: 531e15e38c am: ba5da0d7d1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554777

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb6388d43a68d294956337dcea8e144e8eade976
2021-01-21 23:53:44 +00:00
David Anderson
6365f57979 Merge changes I06043f8e,I872f271c am: 4787c1fa28
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554941

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1c978d37af6816dbf2a542604caa49bd7779362
2021-01-21 23:42:02 +00:00
David Anderson
ba5da0d7d1 Merge "libsnapshot: Removed the unused "linear" optimization." am: 531e15e38c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1554777

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieef44055e61c5152a43106f86f5c897ef46274e4
2021-01-21 23:28:27 +00:00
Treehugger Robot
547bb7ba76 Merge "trusty: keymaster-hal: Reconnect on failed VERSION" am: 1433d42cea am: c1ec38f7be
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I224c448c513fc12bfaaaf45fc32096cefd86cb10
2021-01-21 23:23:07 +00:00
David Anderson
3ee2475061 libsnapshot: Only enable compression when the corresponding bit is set in DeltaArchiveManifest.
Test: vts_libsnapshot_test
Change-Id: I43bab4a823d61c56596e1fd5b1522de08b9674f2
2021-01-21 15:15:40 -08:00
Treehugger Robot
c1ec38f7be Merge "trusty: keymaster-hal: Reconnect on failed VERSION" am: 1433d42cea
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1553887

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c49e35912d4992562d7aa2e9df9c5cf3ff56919
2021-01-21 23:08:42 +00:00
David Anderson
4787c1fa28 Merge changes I06043f8e,I872f271c
* changes:
  libsnapshot: Use a two-phase merge for VABC.
  libsnapshot: Pass the correct source device to snapuserd.
2021-01-21 21:10:38 +00:00
David Anderson
531e15e38c Merge "libsnapshot: Removed the unused "linear" optimization." 2021-01-21 20:49:42 +00:00