Commit graph

74841 commits

Author SHA1 Message Date
Elliott Hughes
d349650f07 Merge "Define AIDs for Weaver, Keymint and IdentityCredential applets." am: d07d694175
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2002211

Change-Id: I9a250ea7e084a9b87807ce75e2590446c3188e35
2022-03-04 02:05:29 +00:00
Elliott Hughes
d07d694175 Merge "Define AIDs for Weaver, Keymint and IdentityCredential applets." 2022-03-04 01:40:37 +00:00
Bart Van Assche
b055fb1b38 Merge changes I4b9b76c9,I6f329491,I9c783193,I0798cc94 am: 40080208c1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004800

Change-Id: If7eb1e10bdd07a33f6ae37f70d520d15618ff32f
2022-03-03 22:15:06 +00:00
Bart Van Assche
40080208c1 Merge changes I4b9b76c9,I6f329491,I9c783193,I0798cc94
* changes:
  healthd: Convert multiple private methods into static nonmember functions
  healthd: Fix readFromFile()
  healthd: Make initHealthInfo() easier to read
  healthd: Improve readability of BatteryMonitor::init()
2022-03-03 21:18:17 +00:00
Bart Van Assche
095c944b48 healthd: Convert multiple private methods into static nonmember functions
The private methods in class BatteryMonitor do not use the 'this'
pointer. Hence convert these into static nonmember functions.

Test: Compile-tested only.
Change-Id: I4b9b76c9697f1db894ba9fb939ce096ee6b7ff3b
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-03 18:46:12 +00:00
Bart Van Assche
5a7e5083e6 healthd: Fix readFromFile()
Not all readFromFile() callers pass an empty string. Make sure that
readFromFile() returns 0 (failure) if the *buf argument is not empty and
if reading fails.

Fixes: 3217c5c7d9 ("batterymonitor: simplify readFromFile and use std::string buffers")
Test: Compile-tested only.
Change-Id: I6f329491f8aa4a6d378eb7c3cbc17038eb6aa64d
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-03 18:46:12 +00:00
Bart Van Assche
024e18f060 healthd: Make initHealthInfo() easier to read
Use aggregate initialization instead of memberwise initialization. This
patch does not change any functionality.

Test: Compile-tested only.
Change-Id: I9c7831936e449aec8a48336b1ee76d26638e4f72
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-03 18:46:12 +00:00
Bart Van Assche
25b2a8de53 healthd: Improve readability of BatteryMonitor::init()
Declare and assign in a single statement instead of in two separate
statements. This patch does not change any functionality.

Test: Compile-tested only.
Change-Id: I0798cc940f5f2ca329548568ab68e96891521dd8
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-03 18:46:12 +00:00
Samiul Islam
82f6d2dcc7 Merge changes I310feb08,I2b6d6b08 am: 242ed1bb20
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004994

Change-Id: I7a2739b22d9e25cb4352832c6bcb47eab5bcf7a9
2022-03-03 10:08:02 +00:00
Samiul Islam
ecefb5a0ed Create utility method for calculating supplemental_uid from app_uid am: b18fea1abb
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004993

Change-Id: I91ab5fd0e4789fd21b69911bcc448a23434b0521
2022-03-03 10:08:00 +00:00
Samiul Islam
242ed1bb20 Merge changes I310feb08,I2b6d6b08
* changes:
  Rename SupplementalProcess to SdkSandbox
  Create utility method for calculating supplemental_uid from app_uid
2022-03-03 09:06:28 +00:00
Yi-yo Chiang
01f95d2ea5 Merge "fs_mgr: Fix misleading comment text regarding __ANDROID_RECOVERY__" am: fb81cf765a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1996611

Change-Id: If382a3c6ef01c5f5ab6cbdaf78b67ae003fd00e1
2022-03-03 06:40:07 +00:00
Yi-yo Chiang
fb81cf765a Merge "fs_mgr: Fix misleading comment text regarding __ANDROID_RECOVERY__" 2022-03-03 06:23:14 +00:00
Thiébaud Weksteen
d16229a571 Merge "Document firmware_class.path" am: 1f2ea5504f
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2005452

Change-Id: I8a1ba2b6d502de8e8a4fece5de0e910195699edd
2022-03-03 05:36:03 +00:00
David Anderson
95cfb66ac1 Merge "fs_mgr: Restrict dt fstabs to < Q devices." am: 390851dd29
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1991382

Change-Id: If5dcf065749c5406f05c4f419a3617512989f7fb
2022-03-03 05:35:53 +00:00
Thiébaud Weksteen
1f2ea5504f Merge "Document firmware_class.path" 2022-03-03 05:17:21 +00:00
David Anderson
390851dd29 Merge "fs_mgr: Restrict dt fstabs to < Q devices." 2022-03-03 05:05:19 +00:00
Treehugger Robot
89ddc2b7d6 Merge "Invert history." am: 412eacb7e1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2005062

Change-Id: If2da1855470f4279739c2189efec113663be64d8
2022-03-03 04:42:54 +00:00
Treehugger Robot
412eacb7e1 Merge "Invert history." 2022-03-03 04:25:15 +00:00
Treehugger Robot
6cd3f0a179 Merge "inspect_cow: Print OTA ops for debugging" am: d297b88e3e
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2003095

Change-Id: I5b7fa8f61ab9c4c7abca625a4382f8049aadea61
2022-03-03 03:36:08 +00:00
Treehugger Robot
fdcfae455b Merge "libsnapshot: Edit OWNERS file" am: 4618fa3e2a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004758

Change-Id: I42d5537082bb1baf87dec84cbbc4d6a3fa2728ee
2022-03-03 03:35:58 +00:00
Treehugger Robot
d297b88e3e Merge "inspect_cow: Print OTA ops for debugging" 2022-03-03 03:35:04 +00:00
Treehugger Robot
4618fa3e2a Merge "libsnapshot: Edit OWNERS file" 2022-03-03 03:15:04 +00:00
Thiébaud Weksteen
87050874bd Document firmware_class.path
This kernel command-line parameter may be used to alter the loading of
firmware.

Bug: 222166126
Test: n/a
Change-Id: I6dc1ae92694cf08b11ab6c3c41aa3d62c992a72a
2022-03-03 13:00:20 +11:00
Elliott Hughes
e2d9fb2116 Invert history.
Change logs are usually easier to read when the newest stuff is at the top...

Change-Id: I6ec76e96a6def88e3594949567b4afb397835d7d
2022-03-03 01:52:15 +00:00
Akilesh Kailash
d49321a6fc libsnapshot: Edit OWNERS file
Bug: 220991038
Test: Presubmit
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: If1f3529b731fb19193857e4009de42dc081edbf9
2022-03-03 01:18:07 +00:00
Yifan Hong
bec22faf12 Merge "healthd: batterymonitor uses AIDL HealthInfo." am: 0326984c42
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004731

Change-Id: I04af2fc284637ea5f371e81a28a62c603de2f34d
2022-03-02 19:41:59 +00:00
Yifan Hong
0326984c42 Merge "healthd: batterymonitor uses AIDL HealthInfo." 2022-03-02 19:20:31 +00:00
Nikita Ioffe
45f8837c90 Rename SupplementalProcess to SdkSandbox
Ignore-AOSP-First: code is not in AOSP yet
Bug: 220320098
Test: presubmit
Change-Id: I310feb08a903c2ee9cd544e3b9751c2e02ce5951
Merged-In: I310feb08a903c2ee9cd544e3b9751c2e02ce5951
(cherry picked from commit 6e124aac7c)
2022-03-02 16:12:41 +00:00
Samiul Islam
b18fea1abb Create utility method for calculating supplemental_uid from app_uid
Every app will now have a corresponding supplemental process associated
with it. We need an utility method to map one to the other.

Implementation details: supplemental process uid will be between range
20k-30k. As such, it will be a 10k offset from app id. See ag/16621743.

Bug: 211763739
Test: atest installd_service_test
Ignore-AOSP-First: Feature is being developed in internal branch
Change-Id: I2b6d6b086985bcb24c837eaa95a937d429d6a583
Merged-In: I2b6d6b086985bcb24c837eaa95a937d429d6a583
(cherry picked from commit 1c7acfdb67)
2022-03-02 13:29:40 +00:00
Yifan Hong
b99d15c529 healthd: batterymonitor uses AIDL HealthInfo.
This change cleans up technical debt. As a side
effect, this change also exposes chargerDockOnline
properly to health HAL implementations.

Test: TH
Bug: 222120465
Change-Id: I306bd0538d94b310a69befb93b5862dd7208447f
2022-03-02 16:20:35 +08:00
Treehugger Robot
029e47a6b0 Merge "vts_fs_test: Statically link libfs_mgr." am: 1e80f2d47d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004734

Change-Id: I0ace3058906f70c4be34e719479fc40b81b9db9a
2022-03-02 02:57:18 +00:00
subrahmanyaman
8b83ce6186 Define AIDs for Weaver, Keymint and IdentityCredential applets.
Bug: b/222112165
Test: Run vts/cts tests
Change-Id: I2fc9144fe4a2d55bf091d8371ba2b78486b1b9c7
2022-03-02 02:35:24 +00:00
Treehugger Robot
1e80f2d47d Merge "vts_fs_test: Statically link libfs_mgr." 2022-03-02 02:29:44 +00:00
David Anderson
0a9c083b87 vts_fs_test: Statically link libfs_mgr.
Bug: 222065493
Test: builds
Change-Id: I9ce4aa2594a4e946c79a51f0ed3d2121c7eaee36
2022-03-01 14:12:26 -08:00
Bart Van Assche
baa911e297 Merge changes I5a6f587e,I972f4e60,Ib8e1e87f am: 8b162ac936
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2003092

Change-Id: Idd0103676a9840591deabff0b7c9d374f0bca438
2022-03-01 15:47:35 +00:00
Bart Van Assche
8b162ac936 Merge changes I5a6f587e,I972f4e60,Ib8e1e87f
* changes:
  Introduce the RunService() method
  Introduce the ConfigureMemcg() method
  Introduce the Service::CheckConsole() method
2022-03-01 15:20:03 +00:00
Bart Van Assche
bd73665e68 Introduce the RunService() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: I5a6f587ecc5e6470137de6cceda7e685bce28ced
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
Bart Van Assche
f2222aab6a Introduce the ConfigureMemcg() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: I972f4e60844bb0d133b1cca1fd4e06bb89fc5f37
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
Bart Van Assche
847b80a112 Introduce the Service::CheckConsole() method
The Service::Start() method is so long that its length negatively
affects readability of the code. Hence this patch that splits
Service::Start().

Test: Booted Android in Cuttlefish.
Change-Id: Ib8e1e87fbd335520cbe3aac2a88d250fcf3b4ff0
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2022-03-01 15:17:33 +00:00
David Drysdale
bdeef4b0ed Merge "Include correct authorization_set.h header" am: b99ace4af1
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1992925

Change-Id: I259e564d82ec1a8202faa771e6b3af01b0f2b87c
2022-03-01 11:02:21 +00:00
David Drysdale
b99ace4af1 Merge "Include correct authorization_set.h header" 2022-03-01 10:31:26 +00:00
Wei Wang
6bf71e0cdd Merge "Support process path for WriteFileAction" am: a323e0233d
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1979310

Change-Id: I051ae3978453680b00fa9f16e5f54bd846ac476f
2022-03-01 00:23:30 +00:00
Wei Wang
a323e0233d Merge "Support process path for WriteFileAction" 2022-03-01 00:06:57 +00:00
Akilesh Kailash
d494442f90 inspect_cow: Print OTA ops for debugging
Bug: 220991038
Test: inspect_cow
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Id77518c7c102aca4979e6eccf45c7cc822f9ccd1
2022-02-28 22:05:21 +00:00
Treehugger Robot
dbc6027fde Merge "Update to KeyMint & iRPC v2" am: 8e4b2bfd5b
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2002271

Change-Id: I1207f05e419109cc38f8944d7b1b1ce9fbaef87b
2022-02-28 22:04:25 +00:00
Treehugger Robot
8e4b2bfd5b Merge "Update to KeyMint & iRPC v2" 2022-02-28 21:46:00 +00:00
Shawn Willden
0485712141 Update to KeyMint & iRPC v2
Bug: 221390931
Test: run vts -m vts_treble_vintf_vendor_test
Change-Id: I1749439700f78433d31b52067edb32a031cc8777
2022-02-28 09:35:43 -07:00
Rick Yiu
9221b1eeae Support process path for WriteFileAction
Currently, there is no distinguish between SetTaskProfiles and
SetProcessProfiles in WriteFileAction because they use the same task
path. Add ProcFilePath attribute so that WriteFileAction could use
a separate path for process in SetProcessProfiles.

Bug: 218684257
Test: function works
Change-Id: I004b8c8799240c54f1ef1fed0566fa5057341cf4
2022-02-26 12:38:03 +00:00
Devin Moore
793e1777b5 Merge "Update init/README.md to mention bootconfig for androidboot argument" am: 192b5569b0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2000397

Change-Id: Ic2544524b5406a55e60bb4a755aae90621437db3
2022-02-25 23:29:03 +00:00