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

56340 commits

This branch
This branch
All branches
Author SHA1 Message Date
Automerger Merge Worker
8be750eb39 Merge "Revert "Mount binderfs"" am: 823beae16a am: 146d595675 
Change-Id: I13c3a172a4f6d9d2325ee4a6f1fd0f94550aede9
 2020-02-03 18:58:35 +00:00
Automerger Merge Worker
146d595675 Merge "Revert "Mount binderfs"" am: 823beae16a 
Change-Id: Ifaab3af435cca160897c56ba0ca1251726a50c53
 2020-02-03 18:49:39 +00:00
Treehugger Robot
823beae16a Merge "Revert "Mount binderfs"" 2020-02-03 18:37:40 +00:00
Automerger Merge Worker
121aae986f Merge "charger: uses health HAL service." am: 3d3165702b am: 3e5a1289b9 
Change-Id: Ib0e30b9636e3cf1f6863a2f789ac5fa39141ffd9
 2020-02-03 18:33:30 +00:00
Automerger Merge Worker
3e5a1289b9 Merge "charger: uses health HAL service." am: 3d3165702b 
Change-Id: I35f4db5dc0cb6c834ab30fd9be2a8efc88472285
 2020-02-03 18:22:05 +00:00
Yifan Hong
3d3165702b Merge "charger: uses health HAL service." 2020-02-03 18:12:23 +00:00
Automerger Merge Worker
9f6a18dff1 Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78 am: 6a97572d2e 
Change-Id: Ic8dcd133449945e7fce8eda9821ef14700e3d276
 2020-02-03 18:12:19 +00:00
Automerger Merge Worker
6a97572d2e Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78 
Change-Id: I5e33934de587c18d9ccdb0734c0ea1ca58d2016e
 2020-02-03 18:03:55 +00:00
Oli Lan
0460f65f78 Merge "Allow apexd to snapshot and restore DE data." 2020-02-03 17:50:51 +00:00
Automerger Merge Worker
5f8554af03 Merge "Update assertion on DmTargetDefaultKey param string" am: ad9190e340 am: f8e965842a 
Change-Id: Ie875c81ac8605f66b40bfb4ef5abc53c12b3e7d1
 2020-02-03 17:26:07 +00:00
Automerger Merge Worker
58b15c03b7 Merge "Don't retrigger bootstat during userspace reboot." am: 64e28438c8 am: 5ebeb57439 
Change-Id: I43a6872b112691e03c60c4e5bc8a9ac323d52d68
 2020-02-03 17:25:58 +00:00
Automerger Merge Worker
f8e965842a Merge "Update assertion on DmTargetDefaultKey param string" am: ad9190e340 
Change-Id: I694f3aec8556450af6b71c634c767340497387e3
 2020-02-03 17:17:54 +00:00
Treehugger Robot
ad9190e340 Merge "Update assertion on DmTargetDefaultKey param string" 2020-02-03 17:15:47 +00:00
Automerger Merge Worker
5ebeb57439 Merge "Don't retrigger bootstat during userspace reboot." am: 64e28438c8 
Change-Id: I160bbc6da4722bb9692866a164905181e0dbf09d
 2020-02-03 17:11:40 +00:00
Nikita Ioffe
64e28438c8 Merge "Don't retrigger bootstat during userspace reboot." 2020-02-03 17:02:49 +00:00
Automerger Merge Worker
6abf55072f Merge "init: handle process actions when waiting for exec services" am: db8881b769 am: e503a21b0e 
Change-Id: I90b873642bc6008d15901e4d5b561a111173c435
 2020-02-03 14:25:43 +00:00
Automerger Merge Worker
e503a21b0e Merge "init: handle process actions when waiting for exec services" am: db8881b769 
Change-Id: Ib4cac038b8a95ebbc74c15e2ea25982b6cd6aa1d
 2020-02-03 14:10:46 +00:00
Tom Cherry
db8881b769 Merge "init: handle process actions when waiting for exec services" 2020-02-03 14:02:40 +00:00
Automerger Merge Worker
c79ad41b9e Merge "Harden /mnt/pass_through paths" am: 294c16024b am: 8cf544b7eb 
Change-Id: Ib311a1d8cb98606fc4e952ace57d2991e3842175
 2020-02-03 11:59:01 +00:00
Automerger Merge Worker
8cf544b7eb Merge "Harden /mnt/pass_through paths" am: 294c16024b 
Change-Id: I4f7c433bdff45c44aadd4789263b22c00a470ed7
 2020-02-03 11:48:30 +00:00
Oli Lan
a466ca8ff4 Allow apexd to snapshot and restore DE data. 
This calls into apexd to allow it to snapshot and restore DE apex data
in the case of a rollback. See the corresponding apexd change for more
information.

Cherry-pick from (unsubmitted) internal CL: ag/10163227

Bug: 141148175
Test: atest StagedRollbackTest#testRollbackApexDataDirectories_DeSys
Change-Id: Ia4bacc9b7b7a77038ba897acbc7db29e177a6433
 2020-02-03 11:47:15 +00:00
Zimuzo Ezeozue
294c16024b Merge "Harden /mnt/pass_through paths" 2020-02-03 11:34:52 +00:00
Alessio Balsini
fb19ed9130 Update assertion on DmTargetDefaultKey param string 
Due to some recent code updates that introduced some additional
extra_argv, the DmTargetDefaultKey::GetParameterString() test was
failing.
Update the string accordingly.

Bug: none
Test: libdm_test
Change-Id: I63fab27e32a08211a43d4804d90a6f19ea4edc06
Signed-off-by: Alessio Balsini <balsini@google.com>
 2020-02-03 10:37:36 +00:00
Automerger Merge Worker
2d5970ffc2 Merge "Add AID_EXT_DATA_RW / AID_EXT_OBB_RW GIDs." am: e6acbfe556 am: e9b7b464bd 
Change-Id: I38f83eae5bf044621626ac2ddb0086e31153b233
 2020-02-03 10:32:16 +00:00
Nikita Ioffe
4d8e3eaf9f Don't retrigger bootstat during userspace reboot. 
Userspace reboot can be treated as extension of runtime restart: instead
of restarting just system_server, it restarts all post-data services.

Test: adb reboot userspace
Test: checked bootstat didn't run again.
Test: system/core/bootstat/boot_reason_test.sh
Bug: 135984674
Change-Id: Ieda4b201f9b9294a3a54b7f0118ee769f5dd2065
 2020-02-03 10:30:06 +00:00
Automerger Merge Worker
e9b7b464bd Merge "Add AID_EXT_DATA_RW / AID_EXT_OBB_RW GIDs." am: e6acbfe556 
Change-Id: Id6a2de9caced43e72b0140df2b6c14b51b3511cf
 2020-02-03 10:23:09 +00:00
Treehugger Robot
e6acbfe556 Merge "Add AID_EXT_DATA_RW / AID_EXT_OBB_RW GIDs." 2020-02-03 10:14:33 +00:00
Automerger Merge Worker
74b6e13a6d Merge "libadbconnection_client: apply version script to library." am: 28bf90f32b am: eee0bf53b9 
Change-Id: I86ec4a5edf217f7fde082316f3991b131ca6514d
 2020-02-03 09:48:05 +00:00
Automerger Merge Worker
eee0bf53b9 Merge "libadbconnection_client: apply version script to library." am: 28bf90f32b 
Change-Id: If7a765626a5ca9865f5a4b6d3633f96a9e5fa774
 2020-02-03 09:37:04 +00:00
Josh Gao
28bf90f32b Merge "libadbconnection_client: apply version script to library." 2020-02-03 09:28:57 +00:00
Automerger Merge Worker
d3f14f4878 Merge "Don't reset sys.usb.configfs during userspace reboot" am: 03aaecbd99 am: 863d5fd4c3 
Change-Id: I4b67c2555a5402cb9583c57a74db609e3d6c50cd
 2020-02-03 08:34:28 +00:00
Automerger Merge Worker
863d5fd4c3 Merge "Don't reset sys.usb.configfs during userspace reboot" am: 03aaecbd99 
Change-Id: I4f9df78cc5efb8e8bb032b226742fe05642f0f02
 2020-02-03 08:22:32 +00:00
Nikita Ioffe
03aaecbd99 Merge "Don't reset sys.usb.configfs during userspace reboot" 2020-02-03 08:12:38 +00:00
Automerger Merge Worker
a83e84d6a2 Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: cb1a8e7fdd am: f6bb9cd7ad 
Change-Id: I391b43ec23408954ba935b563757d525ae06b46e
 2020-02-01 16:29:54 +00:00
Automerger Merge Worker
00ee154dac Add support for v2 of dm-default-key am: f1b264f17c am: 0eefb29054 
Change-Id: I28380ee2d3c60e076312f6c0eb3eb43b603139ce
 2020-02-01 16:29:52 +00:00
Automerger Merge Worker
f6bb9cd7ad Merge changes from topics "dm-default-key-v2", "metadata_cipher" am: cb1a8e7fdd 
Change-Id: Iad7cbe4ac9b2be29f490e638465cfc28f8214d00
 2020-02-01 16:19:49 +00:00
Automerger Merge Worker
0eefb29054 Add support for v2 of dm-default-key am: f1b264f17c 
Change-Id: Ifa4b5b8c8c4576660785d9bc79373154d9aa86fa
 2020-02-01 16:19:45 +00:00
Treehugger Robot
cb1a8e7fdd Merge changes from topics "dm-default-key-v2", "metadata_cipher" 
* changes:
  Set metadata cipher in fstab
  Add support for v2 of dm-default-key
 2020-02-01 16:12:30 +00:00
Automerger Merge Worker
a3b73e94f9 Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" am: afb6b354a9 am: 23d4c35a72 
Change-Id: Ie59f1fd89adb3332998ef69d4d77eefdb5904a8b
 2020-02-01 12:47:07 +00:00
Automerger Merge Worker
23d4c35a72 Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" am: afb6b354a9 
Change-Id: I866142e641e46f9ed30cb0393825a1797d2f30c9
 2020-02-01 12:37:12 +00:00
Treehugger Robot
afb6b354a9 Merge "Propagate failure of MetadataBuilder creation in CreateUpdateSnapshots" 2020-02-01 12:22:38 +00:00
Automerger Merge Worker
81f0a19a5f Merge changes from topic "libmetricslogger" am: de6a99d702 am: ebdf08318f 
Change-Id: Idb2007358af18340805d1168bebbe908e7a6604e
 2020-02-01 07:11:22 +00:00
Automerger Merge Worker
5abf787050 Remove libmetricslogger dependency from bootstats am: fe0b389190 am: 47b061795d 
Change-Id: Iff2ffc11cb9c084cbcc073f0e7151580ed2c17fb
 2020-02-01 07:11:20 +00:00
Automerger Merge Worker
cd5ee4246f Merge "Check /sys/kernel/tracing for tracefs" am: a6c834f960 am: 73a3552047 
Change-Id: Id5385619fb674a92f05a3855e328ae48a458d852
 2020-02-01 07:11:01 +00:00
Automerger Merge Worker
ebdf08318f Merge changes from topic "libmetricslogger" am: de6a99d702 
Change-Id: Id4354ba024b98631a3d3ee4bc638d9c17586a872
 2020-02-01 07:00:53 +00:00
Automerger Merge Worker
47b061795d Remove libmetricslogger dependency from bootstats am: fe0b389190 
Change-Id: Ibf52227cd46b8616de79b69d6e62fe9f7eaff4d3
 2020-02-01 07:00:51 +00:00
Automerger Merge Worker
73a3552047 Merge "Check /sys/kernel/tracing for tracefs" am: a6c834f960 
Change-Id: Ied26985b145eea03815c384bd225594dda7710e9
 2020-02-01 07:00:29 +00:00
Howard Ro
de6a99d702 Merge changes from topic "libmetricslogger" 
* changes:
  Deprecate libmetricslogger
  Remove libmetricslogger dependency from bootstats
 2020-02-01 06:56:38 +00:00
Treehugger Robot
a6c834f960 Merge "Check /sys/kernel/tracing for tracefs" 2020-02-01 06:50:45 +00:00
Automerger Merge Worker
3678cfa412 [automerger skipped] Merge "rootdir: init.rc to limit discard size to 128MB" into qt-qpr1-dev am: be9114f220 -s ours 
am skip reason: Change-Id Iaa8ef6eb862934af43254bd10873a12c3d34e926 with SHA-1 fe9e8a3fa5 is in history

Change-Id: I36721c524982a0b63b5d3d7b3252cf67e8c35fc1
 2020-02-01 02:01:19 +00:00