Commit graph

56253 commits

Author SHA1 Message Date
Automerger Merge Worker
16dbe5dedd Merge "task_profiles.json: Fix uclamp attribute" am: 44da3704f7
Change-Id: I1b22629b71508585b04e04f87745d8f3ea54c18f
2020-02-04 18:00:15 +00:00
Treehugger Robot
44da3704f7 Merge "task_profiles.json: Fix uclamp attribute" 2020-02-04 17:50:11 +00:00
Quentin Perret
20b2f1e0ab task_profiles.json: Fix uclamp attribute
task_profiles.json currently uses attributes of a defunct version of
uclamp, which was used for testing.

Let's use the attributes that actually got merged upstream instead.

Bug: 143710295
Change-Id: Ic6a14f52e14efeefc91f6e6bf580c15e2eded82e
Signed-off-by: Quentin Perret <qperret@google.com>
2020-02-04 13:10:31 +00:00
Automerger Merge Worker
4a0bbf0838 Merge "Add libadbd_auth to adbd's required list." am: 955601beb4
Change-Id: I0d2443f77cd44ec8766ba89ed6419cc7ea97504e
2020-02-04 10:29:18 +00:00
Josh Gao
955601beb4 Merge "Add libadbd_auth to adbd's required list." 2020-02-04 10:16:41 +00:00
Josh Gao
9952258416 Add libadbd_auth to adbd's required list.
It seems like we might not be tracking dependencies properly on
devices with flattened APEXes? Add libadbd_auth to adbd's required
list to work around this for now.

Bug: http://b/148812347
Test: `ls $ANDROID_PRODUCT_OUT/system/lib/libadbd_auth.so` before and after when building a go device
Change-Id: If60abeb00797e37bf6a5a037249a21877e0b3d26
2020-02-04 07:17:19 +00:00
Automerger Merge Worker
545c380d43 Merge "Mount binderfs" am: b970633642
Change-Id: Id6892daceffdf3b9288761ecc55045e2e5c37ca2
2020-02-04 00:57:37 +00:00
Treehugger Robot
b970633642 Merge "Mount binderfs" 2020-02-04 00:50:10 +00:00
Automerger Merge Worker
80183a10cd Merge "Add adbd_test to mts." am: d0854b3397
Change-Id: I5a6c747472a69cd80962e5681ce5b626ff88d879
2020-02-03 23:40:19 +00:00
Josh Gao
d0854b3397 Merge "Add adbd_test to mts." 2020-02-03 23:30:12 +00:00
Automerger Merge Worker
c50d82e418 Merge "Add support for casefold and product ID to format" am: 2e10d8f74f
Change-Id: I06c6d888848c4a138729c560af21f9f984f793bb
2020-02-03 23:24:09 +00:00
Daniel Rosenberg
2e10d8f74f Merge "Add support for casefold and product ID to format" 2020-02-03 23:12:15 +00:00
Hridya Valsaraju
b237d76ae5 Mount binderfs
Mount binderfs at /dev/binderfs. Also add symlinks from /dev/binder,
/dev/hwbinder and /dev/vndbinder to /dev/binderfs/binder,
/dev/binderfs/hwbinder and /dev/binderfs/vndbinder respectively.

The symlink commands will fail harmlessly on a kernel
which does not support binderfs since /dev/{binder,hwbinder,vndbinder}
devices will exist on the same.

Bug: 136497735
Bug: 148696163

Test: Cuttlefish boots on Android Common Kernel 4.19 with kernel config
CONFIG_ANDROID_BINDERFS=y.

Change-Id: I8e04340dc4622b0a3c1fc4aa6bbefcb24eefe00b
2020-02-03 22:14:21 +00:00
Automerger Merge Worker
5ef6de1910 Merge "Add libdm_test to presubmit" am: be074feb93
Change-Id: I397b1ab1375ce85fa98e908d931ac133cddaa942
2020-02-03 22:04:13 +00:00
Treehugger Robot
be074feb93 Merge "Add libdm_test to presubmit" 2020-02-03 21:55:39 +00:00
Automerger Merge Worker
e263f4d717 Merge "adbd: actually dynamically link against libadbd_auth." am: d5bad7c021
Change-Id: Ica9eb1a9bdb4fcd6998493adb845e9ade8c4e3c2
2020-02-03 20:17:53 +00:00
Automerger Merge Worker
da06572d74 Merge "Missing UpdateState::Cancelled string conversions" am: 962e3ddfd6
Change-Id: I679ee467be42ae1955992ff5f664cff8071d5d5b
2020-02-03 20:17:43 +00:00
Josh Gao
d5bad7c021 Merge "adbd: actually dynamically link against libadbd_auth." 2020-02-03 20:15:20 +00:00
Treehugger Robot
962e3ddfd6 Merge "Missing UpdateState::Cancelled string conversions" 2020-02-03 20:03:56 +00:00
Automerger Merge Worker
aa07f58bcf Merge "The darwin linker does not support version scripts" am: a911933a23
Change-Id: I34ed28be53c24fefca39adc43f6a383aab9acce7
2020-02-03 19:57:14 +00:00
Treehugger Robot
a911933a23 Merge "The darwin linker does not support version scripts" 2020-02-03 19:48:25 +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
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
6a97572d2e Merge "Allow apexd to snapshot and restore DE data." am: 0460f65f78
Change-Id: I5e33934de587c18d9ccdb0734c0ea1ca58d2016e
2020-02-03 18:03:55 +00:00
Dan Willemsen
a536b4280e The darwin linker does not support version scripts
Fixes: 148774297
Test: m nothing   on a mac
Change-Id: I4000b2076fe2dde3776b112b506ee3266a529fc6
2020-02-03 10:02:41 -08:00
Oli Lan
0460f65f78 Merge "Allow apexd to snapshot and restore DE data." 2020-02-03 17:50:51 +00:00
Alessio Balsini
d7cc465481 Add libdm_test to presubmit
Also add libdm_test to the TEST_MAPPING's presubmit of fs_mgr to run the
test on TH whenever changes are applied to the fs_mgr contents.

Test: TH
Bug: none
Change-Id: Icc6adeeacaefbcfeb494f37fc776eb5a886a5183
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-03 17:34:44 +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
Alessio Balsini
a60f6a35ec Missing UpdateState::Cancelled string conversions
Add the missing UpdateState::Cancelled conversions from/to string.

Bug: none
Test: build
Change-Id: I097d80e21521725fbb02f3ef37b22e95a5e83929
Signed-off-by: Alessio Balsini <balsini@google.com>
2020-02-03 16:37:51 +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
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
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
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
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
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