ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
64964 commits 1 branch 0 tags 217 MiB
Commit graph

64964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wenhao Wang
cb8aa65bad Merge "rpmb_dev: Switch to RPMB provisioning scheme" am: 323353413f am: d969516a1c 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446626

Change-Id: Id5d9450a5364361a710dee43f36c5259ab6a47e8
 2020-10-10 05:57:44 +00:00
Wenhao Wang
d969516a1c Merge "rpmb_dev: Switch to RPMB provisioning scheme" am: 323353413f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446626

Change-Id: Ic1bb9f2cb2b84f535fa8bd7a05f85199658d7f48
 2020-10-10 05:26:59 +00:00
Wenhao Wang
323353413f Merge "rpmb_dev: Switch to RPMB provisioning scheme" 2020-10-10 05:06:56 +00:00
Treehugger Robot
a0d503616a Merge changes from topic "bug_168791309" am: 8d96bfa9bd am: 68cd2d7c81 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1454640

Change-Id: Id0972a51de501ffcaf7a5bb204d93f0c81d9db10
 2020-10-09 03:41:57 +00:00
Baligh Uddin
108197fb8b Remove liblog, logcat, logd, logwrapper am: d2c21a10d3 am: e55e30f5d9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1454058

Change-Id: I0ee2333ef52b1cfe7d89b4462b48ededc0273ea8
 2020-10-09 03:41:56 +00:00
Xin Li
1d29796fb3 [automerger skipped] Skip ab/6749736 in stage. am: 3deb0ae5fe -s ours 
am skip reason: Change-Id Ib9e04266b47bdc6129c10c72ee35222c49beff1e with SHA-1 11a0227d2a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12797522

Change-Id: Ie43b085c56809b19cccf55d2de28f56029fb0c35
 2020-10-09 03:39:56 +00:00
Treehugger Robot
68cd2d7c81 Merge changes from topic "bug_168791309" am: 8d96bfa9bd 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1454640

Change-Id: I40f47d42101e9e62ec27341a3fb0847d9b5f3d2b
 2020-10-09 03:30:44 +00:00
Baligh Uddin
e55e30f5d9 Remove liblog, logcat, logd, logwrapper am: d2c21a10d3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1454058

Change-Id: I2ee94c97a3518b9c4ae3617ab38418cde5f88e0e
 2020-10-09 03:30:34 +00:00
Treehugger Robot
8d96bfa9bd Merge changes from topic "bug_168791309" 
* changes:
  Add symlinks to satisfy include paths.
  Remove liblog, logcat, logd, logwrapper
 2020-10-09 02:32:02 +00:00
Xin Li
3deb0ae5fe Skip ab/6749736 in stage. 
Merged-In: Ib9e04266b47bdc6129c10c72ee35222c49beff1e
Change-Id: I06da53955499fd138300cd2c9fd25f3e9d7b3617
 2020-10-08 17:23:57 -07:00
Baligh Uddin
5bde9415c3 Merge "Add OWNERS block, so we can perform migration." am: 83e9bc346a am: 071d88912e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455042

Change-Id: I2fa264ddc43c83c4269589ff10eed7deb9343e6c
 2020-10-08 23:32:22 +00:00
Baligh Uddin
62e9b3305d Add symlinks to satisfy include paths. 
BUG: 168791309
Test: Local build + TH
Change-Id: Iafba3e4e8dc837c57af2332057a3c773c3922cb1
 2020-10-08 23:19:43 +00:00
Baligh Uddin
071d88912e Merge "Add OWNERS block, so we can perform migration." am: 83e9bc346a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1455042

Change-Id: I4e33c75a70c5a4283f8a65a8ee568fcce718c4fb
 2020-10-08 23:18:53 +00:00
Baligh Uddin
d2c21a10d3 Remove liblog, logcat, logd, logwrapper 
These subdirectories have moved to platform/system/logging.

BUG: 168791309
Test: Local build + TH
Change-Id: Iaee2ff59d4450f3e59dc9ea8b0e257b2de53e478
 2020-10-08 23:17:52 +00:00
Baligh Uddin
83e9bc346a Merge "Add OWNERS block, so we can perform migration." 2020-10-08 23:05:36 +00:00
Baligh Uddin
23007f0e48 Add OWNERS block, so we can perform migration. 
BUG: 168791309
TEST: YOLO
Change-Id: I6c9c12931203fe2460b2fbdca333f83541324022
 2020-10-08 22:39:51 +00:00
Tom Cherry
fd75f1ab68 Merge "logd: single std::mutex for locking log buffers and tracking readers" am: 8582aa21df am: 07fbf02366 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451058

Change-Id: I4b6cdc24391f8f25aceb35cb6fdd9066714a75cf
 2020-10-08 20:38:56 +00:00
Tom Cherry
07fbf02366 Merge "logd: single std::mutex for locking log buffers and tracking readers" am: 8582aa21df 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451058

Change-Id: I193814f318fc30c8bb7c71565202c93d311480f9
 2020-10-08 20:29:12 +00:00
Tom Cherry
8582aa21df Merge "logd: single std::mutex for locking log buffers and tracking readers" 2020-10-08 19:58:27 +00:00
Akilesh Kailash
dccb39ce02 Merge "libsnapshot:snapuserd: Handle signals" am: c81477c5e4 am: 4d5571310f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449996

Change-Id: I4f8b618825e77aabb0c563a7ae92acc769d17cbe
 2020-10-08 03:37:31 +00:00
Akilesh Kailash
4d5571310f Merge "libsnapshot:snapuserd: Handle signals" am: c81477c5e4 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449996

Change-Id: I13a5e584bb8629e4ad3e918675cc454f9d7532b3
 2020-10-08 03:15:53 +00:00
Akilesh Kailash
c81477c5e4 Merge "libsnapshot:snapuserd: Handle signals" 2020-10-08 02:49:04 +00:00
Tom Cherry
c581886eea logd: single std::mutex for locking log buffers and tracking readers 
There are only three places where the log buffer lock is not already
held when the reader lock is taken:
1) In LogReader, when a new reader connects
2) In LogReader, when a misbehaving reader disconnects
3) LogReaderThread::ThreadFunction()

1) and 2) happen sufficiently rarely that there's no impact if they
additionally held a global lock.
3) is refactored in this CL.  Previously, it would do the below in a loop
  1) Lock the reader lock then wait on a condition variable
  2) Unlock the reader lock
  3) Lock the log buffer lock in LogBuffer::FlushTo()
  4) In each iteration in the LogBuffer::FlushTo() loop
    1) Lock then unlock the reader lock in FilterSecondPass()
    2) Unlock the log buffer lock to send the message, then re-lock it
  5) Unlock the log buffer lock when leaving LogBuffer::FlushTo()
If these locks are collapsed into a single lock, then this simplifies to:
  1) Lock the single lock then wait on a condition variable
  2) In each iteration in the LogBuffer::FlushTo() loop
    1) Unlock the single lock to send the message, then re-lock it

Collapsing both these locks into a single lock simplifes the code and
removes the overhead of acquiring the second lock, in the majority of
use cases where the first lock is already held.

Secondly, this lock will be a plain std::mutex instead of a RwLock.
RwLock's are appropriate when there is a substantial imbalance between
readers and writers and high contention, neither are true for logd.

Bug: 169736426
Test: logging unit tests
Change-Id: Ia511506f2d0935a5321c1b2f65569066f91ecb06
 2020-10-07 15:00:49 -07:00
Akilesh Kailash
f594785a26 libsnapshot:snapuserd: Handle signals 
1: poll events to accept client request.
2: Mask all signals except SIGINT and SIGTERM.

Bug: 168258493
Test: cow_snapuserd_test

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I330170ac15199d2a97cc3b752dbf3b62b7b51a40
 2020-10-07 21:45:45 +00:00
Treehugger Robot
4367354e5a Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts." am: 5f7c13fb1e am: 5d0170c836 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452555

Change-Id: I17aab28f665aeccf9dfeeaa719e0085621a003af
 2020-10-07 20:47:55 +00:00
Treehugger Robot
5d0170c836 Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts." am: 5f7c13fb1e 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452555

Change-Id: Ia2226dd612d1bc48b11a5e70d6838dd218c7d86a
 2020-10-07 20:27:46 +00:00
Treehugger Robot
5f7c13fb1e Merge "fs_mgr: adb-remount-test.sh: filter out more administrivia mounts." 2020-10-07 20:04:53 +00:00
Tom Cherry
ab2b060e2f Merge "Reland: "Remove logging symlinks from system/core/include"" am: 8401907adc am: c75729b3d9 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451056

Change-Id: I9639144540616dbb01ce01a8a2e07799fd4b6f9e
 2020-10-07 15:51:53 +00:00
Tom Cherry
c75729b3d9 Merge "Reland: "Remove logging symlinks from system/core/include"" am: 8401907adc 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451056

Change-Id: Ib94409e7f154f38a699d9522134fee363d2b4123
 2020-10-07 15:38:09 +00:00
Mark Salyzyn
08cd8b70c2 fs_mgr: adb-remount-test.sh: filter out more administrivia mounts. 
binder /dev/binderfs binder rw,relatime,max=1048576,stats=global 0 0
/sys/kernel/debug /sys/kernel/debug debugfs rw,seclabel,relatime 0 0
/dev/block/dm-3 240548676 3692368 236856308   2% /data_mirror/cur_profiles

are administrative mounts uninteresting to the adb remount test.

Fix system and vendor devt tests, turn them into warnings instead.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 170256128
Bug: 169988379
Test: adb-remount-test.sh
Change-Id: Ie19722a9ad813dce014bc27610e6db035e6c69e9
 2020-10-07 08:36:20 -07:00
Tom Cherry
8401907adc Merge "Reland: "Remove logging symlinks from system/core/include"" 2020-10-07 15:11:10 +00:00
Treehugger Robot
c6ee57dca4 Merge "logd: fix bad test assumptions" am: 3f452134da am: c4b150d176 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452015

Change-Id: I10a1f595a6d8749f35a4983957ad9dcaf9668e84
 2020-10-07 08:10:42 +00:00
Treehugger Robot
c4b150d176 Merge "logd: fix bad test assumptions" am: 3f452134da 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1452015

Change-Id: I4988c897ab5e9c5e5dc9f2d6d3040e56d89abf7d
 2020-10-07 07:53:32 +00:00
Treehugger Robot
c33fa91b68 Merge "Clarify adb bugreport failures on pre-N devices." am: 4c7104ab2a am: 73afed6c6f 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451737

Change-Id: I543a41883dd19f1886603c81c24bd76932cde196
 2020-10-07 07:47:03 +00:00
Treehugger Robot
b84d3c7026 Merge "Remove vts10 related configs" am: 52578dda5b am: 95c3867dc1 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451616

Change-Id: I81ec699c9c40f63766970fe0a37a8d4f1b96bc61
 2020-10-07 07:44:59 +00:00
Treehugger Robot
3f452134da Merge "logd: fix bad test assumptions" 2020-10-07 03:12:49 +00:00
Treehugger Robot
73afed6c6f Merge "Clarify adb bugreport failures on pre-N devices." am: 4c7104ab2a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451737

Change-Id: Idb45ba95bf0970e6cdd37405414857e9052e084f
 2020-10-07 01:20:28 +00:00
Treehugger Robot
95c3867dc1 Merge "Remove vts10 related configs" am: 52578dda5b 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1451616

Change-Id: I90fbfd7426ce63fd2a2c59f77d7ae95ee5e620d5
 2020-10-07 01:20:11 +00:00
Treehugger Robot
4c7104ab2a Merge "Clarify adb bugreport failures on pre-N devices." 2020-10-07 00:59:39 +00:00
Treehugger Robot
52578dda5b Merge "Remove vts10 related configs" 2020-10-07 00:35:38 +00:00
Arve Hjønnevåg
89fe40b5c0 Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3 am: 397e40b158 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633

Change-Id: Id105ddfa71ada179b458c2e200e1de4439057cb7
 2020-10-07 00:08:34 +00:00
Arve Hjønnevåg
397e40b158 Merge "trusty: keymaster: set_attestation_key: Change wrapped key" am: 3e7c3504a3 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446633

Change-Id: I44fd518b31ede08ebf01628d2252dd11c0bc57d7
 2020-10-06 23:51:54 +00:00
Arve Hjønnevåg
3e7c3504a3 Merge "trusty: keymaster: set_attestation_key: Change wrapped key" 2020-10-06 23:31:38 +00:00
Tom Cherry
340afd38cb logd: fix bad test assumptions 
SerializedLogChunk.three_logs assumes that log buffers are
zero-initialized, but they are not.  This causes test failures on
host.

Test: this test passes
Change-Id: I0dfa282bdc36eaa4e8e39d85c5227f717b45ec2a
 2020-10-06 15:54:26 -07:00
Xin Li
65c6d185d8 Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 9602e3d31a am: 8c42a18cf8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500

Change-Id: I48a6184d63d99b754d0c55dc1d52ca3f6bbf41e6
 2020-10-06 21:15:48 +00:00
The Android Open Source Project
b39e14e6bc DO NOT MERGE - Merge RP1A.201005.006 am: 7fd5f8d2bc am: 1a016c3af8 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500

Change-Id: Ib33a329d3d44efd346b02e3e4022a0f9e69cc7aa
 2020-10-06 21:15:42 +00:00
Elliott Hughes
f118cd95f1 Clarify adb bugreport failures on pre-N devices. 
The error was meant to imply "without the filename" but (a) that wasn't
spelled out and (b) anyone who did just try the command would probably
be unpleasantly surprised by the massive amount of spam on their
terminal. So give them copy & paste instead.

(I did consider using their supplied filename, but since that's almost
certainly blah.zip, it seemed uncool to silently create a large text
file called "something.zip"!)

Bug: http://b/170225883
Test: untested for lack of a working pre-N device right now
Change-Id: I834939c963ca09927ccd4dc5ed8e88c65455838e
 2020-10-06 13:53:38 -07:00
Dan Shi
67b7dd570f Remove vts10 related configs 
Bug: 169582597
Test: build
Change-Id: I38e1e0f8e32b86ab14b905d040c1c62245a1a9e3
 2020-10-06 13:52:44 -07:00
Xin Li
8c42a18cf8 Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 9602e3d31a 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500

Change-Id: I8b43f619590b1076e7a6973c9a5a6974568f25f9
 2020-10-06 20:24:10 +00:00
The Android Open Source Project
1a016c3af8 DO NOT MERGE - Merge RP1A.201005.006 am: 7fd5f8d2bc 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1449500

Change-Id: If6136de7e90083c318bf1ebb0e24172dbfeacb16
 2020-10-06 20:23:54 +00:00