Commit graph

72591 commits

Author SHA1 Message Date
Treehugger Robot
2f8528e0f7 Merge changes I928ddebc,Iade322a2 am: 4fd0ff9756
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1799827

Change-Id: I2a4075fe28f6001471bae67dae94cd6a3a2863ec
2021-09-08 20:18:54 +00:00
Treehugger Robot
4fd0ff9756 Merge changes I928ddebc,Iade322a2
* changes:
  storageproxyd: Add logging of failed RPMB transactions
  storageproxyd: Add file handle param to debug buffer print
2021-09-08 20:01:31 +00:00
Stephen Crane
310d805d96 storageproxyd: Add logging of failed RPMB transactions
Adds parsing and logging of SCSI errors from SG_IO calls for RPMB. Does
not alter behavior of the RPMB proxy in response to these errors.

Test: m storageproxyd
Bug: 195544379
Change-Id: I928ddebcb65aa6c305d3dcab7c64bd19d11a50fa
2021-09-07 19:54:16 -07:00
Stephen Crane
dd3f7b867d storageproxyd: Add file handle param to debug buffer print
Adds a file handle parameter to the debug print_buf function to allow
printing to either stdout or stderr.

Test: m storageproxyd
Bug: 195544379
Change-Id: Iade322a21312a676b3599bddafdfc43b599617ea
2021-09-07 19:53:04 -07:00
Yifan Hong
96146d1108 Merge "charger: fix charger display stuck" am: e026eff9af
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1813694

Change-Id: I4db565498062a459f8df180a01d02588772c917d
2021-09-07 20:25:43 +00:00
Yifan Hong
e026eff9af Merge "charger: fix charger display stuck" 2021-09-07 19:24:55 +00:00
Treehugger Robot
492e972c8d Merge changes I4fba1982,Ia0812a11 am: 7e8a9d9f33
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1818255

Change-Id: I0efbd258ca7b331fc56026773e3686a948c16835
2021-09-02 22:35:16 +00:00
Treehugger Robot
7e8a9d9f33 Merge changes I4fba1982,Ia0812a11
* changes:
  snapuserd: Fix PrepareReadAhead
  Fix a typo
2021-09-02 22:19:42 +00:00
Daniel Rosenberg
0518f8cb19 snapuserd: Fix PrepareReadAhead
When checking the instead of current, and when checking the position, we could underflow,
which would get caught by UBSAN

Bug: 177104308
Test: Map cow file with xor op or copy op at position 0
Change-Id: I4fba1982419e08b58759ec893e238175d245dbfc
2021-09-02 14:13:29 -07:00
Kelvin Zhang
bb0a7642d6 Fix a typo
this check should be performed on newly returned `op` instead of
`cow_op`

Test: th
Change-Id: Ia0812a1126d3e0bdfaff82859eb4b4a066a73bff
2021-09-02 14:12:19 -07:00
Martin Stjernholm
343cb321eb Merge "Add libdexfile runtime dependency of libdexfile_support (reland)." am: 7b0ae4ba7d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1815784

Change-Id: I0804c7a7a43f765eeefa3fdccb8aba153037d93d
2021-09-02 16:49:07 +00:00
Martin Stjernholm
7b0ae4ba7d Merge "Add libdexfile runtime dependency of libdexfile_support (reland)." 2021-09-02 16:36:43 +00:00
Xiaohui Niu
a40d872989 charger: fix charger display stuck
1.Retry charger when gr init fail caused
by display not ready.
2.Remove meaningless logs which occupy log lines,
the logs that really need to be printed cannot be
output due to printk suppresses kernel logs.

Bug: 197604278
Change-Id: Id9465a0a9c994986192fd39c124d05aed8caa862
Test: Manual. Power off charging.
2021-09-02 03:17:58 +00:00
Christopher Ferris
b04ae2d400 Merge "Remove double check of fd value." am: 4418778882
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1817116

Change-Id: Ie6f020dff0c98d9e604cf2f8e55bcf20c9f1d3dc
2021-09-01 22:40:24 +00:00
Christopher Ferris
4418778882 Merge "Remove double check of fd value." 2021-09-01 22:29:32 +00:00
Christopher Ferris
ab9f0cd759 Remove double check of fd value.
The output.text.fd value is only ever -1 when there is a failure.
There is no need to check both < 0 or -1, so only check for -1.

Test: Unit tests pass.
Test: Verified the message is seen on intercept and not on
Test: regular crashes.
Change-Id: I1eddcd5d2342b268ceb261b246c98b10cee85bb4
2021-09-01 13:36:03 -07:00
Tianjie Xu
7cb8e25a9f Merge "Dump the root digest of hashtree for dm-verity partitions" am: 055abbb4d6
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1814305

Change-Id: I7b7895da336fb2389d243d5d67c7ea5a19d0731f
2021-09-01 17:59:04 +00:00
Tianjie Xu
055abbb4d6 Merge "Dump the root digest of hashtree for dm-verity partitions" 2021-09-01 17:47:11 +00:00
Martin Stjernholm
3784b9de46 Add libdexfile runtime dependency of libdexfile_support (reland).
Necessary since static_libs doesn't propagate transitive dependencies
in Soong.

Test: m droid
Bug: 197856821
Bug: 169779783
Change-Id: Ia70f8596228770451c95610be0e97783dabf3af3
2021-09-01 13:27:48 +01:00
Rex Lin
0c232198f7 Merge "Revert "Add libdexfile runtime dependency of libdexfile_support."" am: 2eaa82ea5c
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1815311

Change-Id: Ic1a59403a32f18b9da4df487aa016e875cd0d305
2021-09-01 06:16:04 +00:00
Rex Lin
2eaa82ea5c Merge "Revert "Add libdexfile runtime dependency of libdexfile_support."" 2021-09-01 06:03:48 +00:00
Rex Lin
dc14d16f80 Revert "Add libdexfile runtime dependency of libdexfile_support."
Revert "Allow visibility on libdexfile for all libdexfile_suppor..."

Revert "Add libdexfile runtime dependency of libdexfile_support."

Revert "Add libdexfile runtime dependency of libdexfile_support."

Revert submission 1810760-libdexfile-runtime-2

Reason for revert: DroidMonitor: Potential culprit for Bug 198352910 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Reverted Changes:
If4da968e4:Add libdexfile runtime dependency of libdexfile_su...
I80162942a:Allow visibility on libdexfile for all libdexfile_...
Iab18abc8e:Add libdexfile runtime dependency of libdexfile_su...
I473d146d8:Add libdexfile runtime dependency of libdexfile_su...

Change-Id: Iacab8e0a5c74e0c3185a155e35c28903aa9acb4a
2021-09-01 01:57:17 +00:00
Treehugger Robot
b3212d41bb Merge changes I3968ff53,I0029838d am: d95a49f555
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1811862

Change-Id: I89de5c87bab9e7739d61d9668d0f140b7a5d42b7
2021-09-01 00:50:42 +00:00
Treehugger Robot
d95a49f555 Merge changes I3968ff53,I0029838d
* changes:
  inspect_cow: Add -l option to show all ops
  inspect_cow: Add -o to view Sequence Data
2021-09-01 00:35:01 +00:00
Martin Stjernholm
58171f1f57 Merge "Add libdexfile runtime dependency of libdexfile_support." am: fe657ea950
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1810838

Change-Id: Ie623eae1e29891da78e2c47e991ef8fba637d1bf
2021-08-31 19:37:39 +00:00
Martin Stjernholm
fe657ea950 Merge "Add libdexfile runtime dependency of libdexfile_support." 2021-08-31 19:10:40 +00:00
Martin Stjernholm
832f1ebeec Add libdexfile runtime dependency of libdexfile_support.
Necessary since static_libs doesn't propagate transitive dependencies
in Soong.

Test: m droid
Bug: 197856821
Bug: 169779783
Change-Id: If4da968e4e2f7ab0aaedd097c914242d0e9eb73e
2021-08-31 17:20:22 +01:00
Tianjie
10bec65ca8 Dump the root digest of hashtree for dm-verity partitions
It's requested by the partner engineering team to uniquely
identify a partition.

Bug: 197973981
Test: boot the device and check props
Change-Id: I0f7aa34dd0087f0698fe90b9df6c0eae06fc4f5d
2021-08-30 17:11:02 -07:00
Treehugger Robot
33bde47880 Merge "[fs_mgr] Use shared libutils for remount" am: f98bcdbac0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1809693

Change-Id: Iddc8a5d44a7f16d1647c7b29ac900a55a291f864
2021-08-30 22:31:40 +00:00
Treehugger Robot
f98bcdbac0 Merge "[fs_mgr] Use shared libutils for remount" 2021-08-30 22:20:27 +00:00
Pirama Arumuga Nainar
cdf919d1f0 [fs_mgr] Use shared libutils for remount
Bug: http://b/197965342

remount depends on libbinder.so which already depends on libutils.so.
When linking remount with libutils.a, the linker tries to fetch objects
from libutils.a to redefine undefined symbols in libbinder.so.  This
causes linker failure with upstream LLD.  Switching to shared
libutils.so instead doesn't increase the dependency closure for remount.

Test: build with aosp/1809741 which has lld with the above behavior.
Change-Id: I858042a08babe2c2db1fc8c7eeb5de62dda5f328
2021-08-30 12:18:08 -07:00
Daniel Rosenberg
b7885099b4 inspect_cow: Add -l option to show all ops
This makes inspect_cow not list all ops by default. Instead you must
pass -l to do this. This allows for viewing other data without being
overwhelmed bt the cow listings.

Test: inspect_cow with no flags, -l, and -lo
Change-Id: I3968ff53acb4e645a16ac5b09c5dee8374946f55
2021-08-27 15:40:53 -07:00
Daniel Rosenberg
f34f18e0a1 inspect_cow: Add -o to view Sequence Data
This allows inspecting sequence op data while viewing cow ops. Data will
be displayed per op.

Test: inspect_cow -o [CowFile]
Change-Id: I0029838ddc265c1aaeba2bbfa70241dea0b8ff20
2021-08-27 15:40:53 -07:00
Joel Galenson
54e849a675 Merge "Add bindgen bindings test" am: c3f73cbd15
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1806537

Change-Id: I358c368be1d49e67cdc086c9d470db3a0d582add
2021-08-27 15:49:05 +00:00
Joel Galenson
c3f73cbd15 Merge "Add bindgen bindings test" 2021-08-27 15:37:11 +00:00
David Anderson
56c898e39d Merge "fastboot: Support casefolding in ext4 partitions." am: b72fa73ace
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1764800

Change-Id: Iec1a3a089c534529c810f20d39d2913ac28de544
2021-08-27 01:38:37 +00:00
David Anderson
b72fa73ace Merge "fastboot: Support casefolding in ext4 partitions." 2021-08-27 01:18:06 +00:00
David Anderson
55b5360a6b Merge "first_stage_init: Add SIGCHLD handler in first_stage_console" am: ce8aa990d5
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1807489

Change-Id: Ie7a6e0d1c341e7cf67c12f8fdef693ce49f743af
2021-08-25 02:46:35 +00:00
David Anderson
ce8aa990d5 Merge "first_stage_init: Add SIGCHLD handler in first_stage_console" 2021-08-25 02:33:59 +00:00
Elliot Berman
6eb234017a first_stage_init: Add SIGCHLD handler in first_stage_console
Add a simple SIGCHLD handler to reap zombie processes given to init.

Bug: 197662257
Change-Id: I6e7930cfd7c311c454b361b9a541369ece2eb744
Signed-off-by: Elliot Berman <quic_eberman@quicinc.com>
2021-08-24 17:20:02 -07:00
Steven Moreland
e5eede1551 Merge "RefBase: Unknown mFlag meaning" am: 53e977339b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1805816

Change-Id: I3594e5658cc4759c0552aedb394f397be94d81d5
2021-08-24 20:27:09 +00:00
Steven Moreland
53e977339b Merge "RefBase: Unknown mFlag meaning" 2021-08-24 20:22:24 +00:00
David Anderson
5ca108dc6e Merge "libsnapshot: Fix missing source partitions when adding a new partition." am: 3936000b3e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1806550

Change-Id: I99c63b4eb37e862ce5de5aad8292ca3eb4fb6e29
2021-08-24 20:22:07 +00:00
David Anderson
3936000b3e Merge "libsnapshot: Fix missing source partitions when adding a new partition." 2021-08-24 20:09:30 +00:00
David Anderson
dc3afaf54a libsnapshot: Fix missing source partitions when adding a new partition.
When adding a new partition, don't attempt to map a source partition
during boot, because none exists. Instead use the base device.

Bug: 196922070
Test: vts_libsnapshot_test
Change-Id: Ice6015237b0a76a0210819994433e52159376393
2021-08-24 00:28:11 -07:00
Christopher Ferris
0d4badef5f Merge "Add fault address marker in proto to tombstone." am: a90757251d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1806543

Change-Id: I272ff8b533b4a2a3d6cfbdf9fc152a1233c6accd
2021-08-24 01:09:26 +00:00
Christopher Ferris
a90757251d Merge "Add fault address marker in proto to tombstone." 2021-08-24 01:00:09 +00:00
Christopher Ferris
7e4c2a8ccc Add fault address marker in proto to tombstone.
When the switch was made to dump the tombstone from the protobuf,
the fault address marker in the maps section went missing. Re-add
that logic and add new unit tests to verify all of the different
behaviors.

Bug: 193935960

Test: All unit tests pass.
Test: All unit tests pass when setprop debug.debuggerd.translate_proto_to_text 0
Test: The above on cuttlefish, 32 bit and 64 bit.
Test: The above on a flame, 32 bit and 64 bit.
Change-Id: I098bb6ab4bacacae2ca0fc5ec9a73549ed0b9489
2021-08-23 16:25:13 -07:00
Joel Galenson
30d4ab6167 Add bindgen bindings test
Note that this is currently a no-op test that does nothing.  But this
makes it future proof in case we add more later.

Test: atest
Change-Id: I23817febd2122f54c40958541fc66363d38b60ca
2021-08-23 13:46:03 -07:00
陈冠有
0cbef728f9 RefBase: Unknown mFlag meaning
Change-Id: I3ddd1895c48c682bdb0868e890c62029710bf1c8
2021-08-22 16:36:36 +00:00