Matthew Maurer
283a2f42bf
Merge "trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd" am: 30b0838b70 am: 85128d42c9 am: dba902a432
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360681
Change-Id: Ia2b6166fd18de586a7ff0cf5c122f9111d9e4c04
2020-07-10 23:19:04 +00:00
Matthew Maurer
dba902a432
Merge "trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd" am: 30b0838b70 am: 85128d42c9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360681
Change-Id: If9fb2c351bbeb880ace063473b27b6ba0e9af2b9
2020-07-10 23:03:04 +00:00
Matthew Maurer
85128d42c9
Merge "trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd" am: 30b0838b70
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360681
Change-Id: I85b0dfc9092d44023d5c5d5dc5bbc1a867f765e4
2020-07-10 22:47:58 +00:00
Matthew Maurer
30b0838b70
Merge "trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd"
2020-07-10 22:27:24 +00:00
Matthew Maurer
8f62566566
trusty: rpmb_dev: Prevent desync between rpmb_dev and storageproxyd
...
The mock RPMB can get out of sync with TD storage blocks in the event of
panic or crash. Making this O_SYNC will prevent this from happening.
Bug: 160723681
Test: None
Change-Id: Ia16dfc88ceae56e4e9724a42ac0db492c0e707a4
2020-07-10 22:09:01 +00:00
Treehugger Robot
fa543ad1dc
Merge "init README: document AIDL service interface" am: 4d3c284605 am: e526b545cd am: b64af0cc2a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360957
Change-Id: I7afb0999fca72acb93a271cdcbdfffcd0d452d9e
2020-07-10 20:14:50 +00:00
Tom Cherry
c99887bab5
Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am: 089455f163 am: cb8ddce387 am: c60efacc4a
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360177
Change-Id: I998009d2d8bb0dbeff730970f123f7662851c0e5
2020-07-10 20:13:54 +00:00
Treehugger Robot
b64af0cc2a
Merge "init README: document AIDL service interface" am: 4d3c284605 am: e526b545cd
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360957
Change-Id: Ib8b619145c77c42afe771755e3e2199bfa5c68dc
2020-07-10 20:03:59 +00:00
Tom Cherry
c60efacc4a
Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am: 089455f163 am: cb8ddce387
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360177
Change-Id: I77aa0019511037fc50eb41dbf8351f8d0ffa6ea0
2020-07-10 20:02:09 +00:00
Treehugger Robot
e526b545cd
Merge "init README: document AIDL service interface" am: 4d3c284605
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360957
Change-Id: I2900e7a9ea5f19c185112a4d6394b0087fda048d
2020-07-10 19:41:00 +00:00
Tom Cherry
cb8ddce387
Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size" am: 089455f163
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1360177
Change-Id: Iea70205318f7dda34db469fa4d1563a85128c81e
2020-07-10 19:40:53 +00:00
Treehugger Robot
4d3c284605
Merge "init README: document AIDL service interface"
2020-07-10 19:30:52 +00:00
Tom Cherry
089455f163
Merge "liblog: remove faulty logic in __android_logger_valid_buffer_size"
2020-07-10 19:26:38 +00:00
Steven Moreland
fa2457e1cd
init README: document AIDL service interface
...
There is documentation for how AIDL works with ctl commands or
interface_start commands, however it seems we were missing documentation
on declaration of interfaces.
Bug: N/A
Test: N/A
Change-Id: I0e5d2350b6b847a870eafbc69828e75f1f6ca4f0
2020-07-10 17:53:18 +00:00
Tom Cherry
0315b29497
liblog: remove faulty logic in __android_logger_valid_buffer_size
...
In testing, I saw that the 'main' and 'events' log buffers were set to
incorrect sizes when they were intended to be >= 4MB. The bug is
tracked down to an invalid line in
__android_logger_valid_buffer_size():
/* maximum memory impact a somewhat arbitrary ~3% */
pages = (pages + 31) / 32;
There are two issues with this line:
1) That is not the right calculation for 3%.
2) `pages` is a static variable, so it repeatedly is decremented until
reaching 1.
The consequence is that this function gives invalid results for the
first few calls, then returns true as long as the input is between
LOG_BUFFER_MIN_SIZE and LOG_BUFFER_MAX_SIZE. That check is enough, so
the rest of this logic is removed.
Test: buffers are set to the right sizes.
Change-Id: I4d19b1d0fdbd83843d2d61a484ac083d571ef37b
2020-07-09 20:39:17 -07:00
Tom Cherry
e29a9a69ad
[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d93 -s ours am: da0fcc19c1 -s ours
...
am skip reason: Change-Id I2353bfa7f598bd19ba57498cc5bbad7a3ed34707 with SHA-1 5c8457ef9a is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12121904
Change-Id: I244edcfb96384ad159dc37e3b2471e5a8fed1b76
2020-07-09 23:15:51 +00:00
Tom Cherry
cd95809382
[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d93 am: 62de73aeb0 -s ours
...
am skip reason: Change-Id I2353bfa7f598bd19ba57498cc5bbad7a3ed34707 with SHA-1 0e40ba3183 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12121904
Change-Id: I056828ce5bf764c32365f5910391662aed60e2e6
2020-07-09 23:15:34 +00:00
Tom Cherry
62de73aeb0
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d93
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12121904
Change-Id: I29fbf50c75b2622f95d272b7a76a9ce3a276f6ad
2020-07-09 23:03:50 +00:00
Tom Cherry
da0fcc19c1
[automerger skipped] Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev am: 8272339d93 -s ours
...
am skip reason: Change-Id I2353bfa7f598bd19ba57498cc5bbad7a3ed34707 with SHA-1 0e40ba3183 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12121904
Change-Id: I053fd6658ead287b5fa2028b4a1f818add3fd3c6
2020-07-09 23:03:31 +00:00
Tom Cherry
8272339d93
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" into rvc-dev
2020-07-09 22:53:44 +00:00
Tom Cherry
5c8457ef9a
init: skip RejectsCriticalAndOneshotService for devices launched before R
...
This restriction is only added for devices launching with R or later.
Bug: 160663765
Test: this test runs when appropriate
Merged-In: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
Change-Id: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
(cherry picked from commit 0e40ba3183 )
2020-07-09 14:36:12 -07:00
Tom Cherry
1154a222ff
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" am: c8e4154d89 am: 9c590e4c97 am: f18e009f97
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359383
Change-Id: If6f5b1a4df56e7e5789d64de9dcab77768787b92
2020-07-09 20:17:12 +00:00
Tom Cherry
f18e009f97
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" am: c8e4154d89 am: 9c590e4c97
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359383
Change-Id: I8d77c402b55b1e460dd49c4a37fd00baada98d5d
2020-07-09 20:06:57 +00:00
Tom Cherry
9c590e4c97
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R" am: c8e4154d89
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359383
Change-Id: Id1ce1ce19e9df18c77fee7bd5e0f01ece54218fe
2020-07-09 19:48:25 +00:00
Tom Cherry
c8e4154d89
Merge "init: skip RejectsCriticalAndOneshotService for devices launched before R"
2020-07-09 19:35:34 +00:00
Tom Cherry
0e40ba3183
init: skip RejectsCriticalAndOneshotService for devices launched before R
...
This restriction is only added for devices launching with R or later.
Bug: 160663765
Test: this test runs when appropriate
Change-Id: I2353bfa7f598bd19ba57498cc5bbad7a3ed34707
2020-07-09 08:49:29 -07:00
Treehugger Robot
86f2a4a080
Merge "Add a libipchecksum that contains the C IP checksum code." am: 69b513ce09 am: dad59e192d am: 532be3125f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359262
Change-Id: Idc9de9cbc1e04aa00ef3b7723ed97e9e8afb5df8
2020-07-09 09:38:22 +00:00
Treehugger Robot
532be3125f
Merge "Add a libipchecksum that contains the C IP checksum code." am: 69b513ce09 am: dad59e192d
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359262
Change-Id: I03d7942fdd2b0f85fb76f5323ffd71b36413ec5c
2020-07-09 09:24:54 +00:00
Treehugger Robot
dad59e192d
Merge "Add a libipchecksum that contains the C IP checksum code." am: 69b513ce09
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1359262
Change-Id: Ic463de260325ad19bd7889282f0a50b87013f459
2020-07-09 09:10:00 +00:00
Treehugger Robot
69b513ce09
Merge "Add a libipchecksum that contains the C IP checksum code."
2020-07-09 08:55:16 +00:00
Lorenzo Colitti
3b56a0226b
Add a libipchecksum that contains the C IP checksum code.
...
This is useful for test code that wants to statically link the IP
checksum code. This is not currently possible because libnetutils
is vendor_available and making it available for static linking is
discouraged.
Test: m libnetutils libipchecksum
Change-Id: Ic7f1864902581b8a5e3626860565b78c168bdb7f
2020-07-09 16:35:47 +09:00
Tianjie Xu
2b00e7aa29
Merge "Add function to compare the partitions' extents in metadata" am: d7b4fe95c7 am: 14bc7fb7e4 am: 7e1411ac63
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352612
Change-Id: Ic093610921ed53a92cb3692e82e98c17a707a959
2020-07-09 03:27:52 +00:00
Tianjie Xu
7e1411ac63
Merge "Add function to compare the partitions' extents in metadata" am: d7b4fe95c7 am: 14bc7fb7e4
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352612
Change-Id: Ic8d47a49fdcd4b602e7ef961f0d0700746a86f99
2020-07-09 03:15:05 +00:00
Tianjie Xu
14bc7fb7e4
Merge "Add function to compare the partitions' extents in metadata" am: d7b4fe95c7
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1352612
Change-Id: I7faf667612073b69a6afc1ab0b7fa8a1304b1e0a
2020-07-09 03:03:09 +00:00
Tianjie Xu
d7b4fe95c7
Merge "Add function to compare the partitions' extents in metadata"
2020-07-09 02:46:47 +00:00
Treehugger Robot
a60a905f31
Merge "Added fuzzer for Unwinder" am: e28cc8cf48 am: e7ab54aba3 am: 26e179c089
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1318953
Change-Id: I3c689572cc71d54ce6ed0ea5224b8692b57592ae
2020-07-09 01:56:06 +00:00
Treehugger Robot
26e179c089
Merge "Added fuzzer for Unwinder" am: e28cc8cf48 am: e7ab54aba3
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1318953
Change-Id: I46bec2882f19dfa0f5ef5f9bc541eb69a978dcf1
2020-07-09 01:45:12 +00:00
Treehugger Robot
e7ab54aba3
Merge "Added fuzzer for Unwinder" am: e28cc8cf48
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1318953
Change-Id: If64ec3c8d305487782c8651173c47d8b7c26616c
2020-07-09 01:35:23 +00:00
Treehugger Robot
e28cc8cf48
Merge "Added fuzzer for Unwinder"
2020-07-09 01:22:01 +00:00
Treehugger Robot
8292947bef
[automerger skipped] Merge changes I51628abe,I412d62b7 am: 9e84b3166f am: 8f713c56bb -s ours am: 86f326500a -s ours
...
am skip reason: Change-Id I51628abe05599422eb3f344781d8f3acd653c822 with SHA-1 bd6d2cded8 is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358184
Change-Id: I30020e9fc2f07365539dc1ca60dadff7077dfefa
2020-07-08 22:00:12 +00:00
Yifan Hong
e96842e59e
[automerger skipped] Try locking after mounting metadata am: fc1e1aeef9 am: dee7426a9b -s ours am: 02f2e8cdf0 -s ours
...
am skip reason: Change-Id I412d62b7005c81a7126106edc471622e6a7ef813 with SHA-1 44033e75cc is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358183
Change-Id: Id4a6c8499093bc0a76029fbfe97844220829b6f8
2020-07-08 22:00:10 +00:00
Treehugger Robot
86f326500a
[automerger skipped] Merge changes I51628abe,I412d62b7 am: 9e84b3166f am: 8f713c56bb -s ours
...
am skip reason: Change-Id I51628abe05599422eb3f344781d8f3acd653c822 with SHA-1 bd6d2cded8 is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358184
Change-Id: Id79a1400ebb70fc7bcb8c570ff5d8be181e9f24a
2020-07-08 21:47:45 +00:00
Yifan Hong
02f2e8cdf0
[automerger skipped] Try locking after mounting metadata am: fc1e1aeef9 am: dee7426a9b -s ours
...
am skip reason: Change-Id I412d62b7005c81a7126106edc471622e6a7ef813 with SHA-1 44033e75cc is in history
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358183
Change-Id: I0f5ec31c2122af1aee0d671820bd7226688f2827
2020-07-08 21:47:42 +00:00
Treehugger Robot
8f713c56bb
Merge changes I51628abe,I412d62b7 am: 9e84b3166f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358184
Change-Id: Ia7b7e643c2326fb49ad0966dd1b69339650b6801
2020-07-08 21:38:13 +00:00
Yifan Hong
dee7426a9b
Try locking after mounting metadata am: fc1e1aeef9
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1358183
Change-Id: I4172d1230feb6038943c2fcc0aa409b0bd837f71
2020-07-08 21:38:12 +00:00
Treehugger Robot
8214e3e90c
Merge "Add libdm and dmctl support for dm-user targets" am: 3042f0ff9f am: 784ab6ed10 am: 165a15d482
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1346622
Change-Id: Ida93a41edea6637832a3cc4c2916025fbab3a447
2020-07-08 21:37:55 +00:00
Treehugger Robot
165a15d482
Merge "Add libdm and dmctl support for dm-user targets" am: 3042f0ff9f am: 784ab6ed10
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1346622
Change-Id: I44c60fbdb7782277f23f365f4c7314565206bc91
2020-07-08 21:25:08 +00:00
Treehugger Robot
9e84b3166f
Merge changes I51628abe,I412d62b7
...
* changes:
Wrap flock with TEMP_FAILURE_RETRY.
Try locking after mounting metadata
2020-07-08 21:23:01 +00:00
Treehugger Robot
784ab6ed10
Merge "Add libdm and dmctl support for dm-user targets" am: 3042f0ff9f
...
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1346622
Change-Id: I2cc257816812006d3a018d2896eb067e897cfc63
2020-07-08 21:13:46 +00:00
Treehugger Robot
3042f0ff9f
Merge "Add libdm and dmctl support for dm-user targets"
2020-07-08 20:59:41 +00:00