Commit graph

4777 commits

Author SHA1 Message Date
Alan Stokes
1446f6fb32 [automerger skipped] Merge "Only kill apps with storage app data isolation enabled" am: b2678b6654 am: 53d7796ccd am: dedb2c1a13 -s ours am: d24f5a26e8 -s ours
am skip reason: Merged-In I45d9a63ed47cbc27aebb63357a43f51ad62275db with SHA-1 a58b535495 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1690874

Change-Id: Iee959b054ab7d6104e0d3713347e57c301ba7976
2021-05-05 15:26:57 +00:00
Alan Stokes
d24f5a26e8 [automerger skipped] Merge "Only kill apps with storage app data isolation enabled" am: b2678b6654 am: 53d7796ccd am: dedb2c1a13 -s ours
am skip reason: Merged-In I45d9a63ed47cbc27aebb63357a43f51ad62275db with SHA-1 a58b535495 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1690874

Change-Id: I641a83e69e7b3ffc267997503cc741cb8a04f030
2021-05-05 15:04:04 +00:00
Alan Stokes
dedb2c1a13 Merge "Only kill apps with storage app data isolation enabled" am: b2678b6654 am: 53d7796ccd
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1690874

Change-Id: I807f10f18d56c8ff1ef36f6b5cad85f2ee911184
2021-05-05 14:45:44 +00:00
Alan Stokes
53d7796ccd Merge "Only kill apps with storage app data isolation enabled" am: b2678b6654
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1690874

Change-Id: I063073d4419566c11207a147ac3260d4cee671a3
2021-05-05 14:30:21 +00:00
Alan Stokes
b2678b6654 Merge "Only kill apps with storage app data isolation enabled" 2021-05-05 14:16:00 +00:00
Eric Biggers
25e8d1805c Merge "Log error message if setting project quota ID fails" am: 7505efbd5d am: 44df16de69 am: 1768a47b25 am: 630fa5785e
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1694189

Change-Id: I895ba92166b9760564ab651c22b8f5782e567a0f
2021-05-04 17:11:54 +00:00
Eric Biggers
630fa5785e Merge "Log error message if setting project quota ID fails" am: 7505efbd5d am: 44df16de69 am: 1768a47b25
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1694189

Change-Id: If76a5f6341b8f21ed49e079e14bd67362fb35f7a
2021-05-04 16:58:24 +00:00
Eric Biggers
1768a47b25 Merge "Log error message if setting project quota ID fails" am: 7505efbd5d am: 44df16de69
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1694189

Change-Id: Idc0cff5798358f977445ebe4f104ccf2fbb42cce
2021-05-04 16:42:09 +00:00
Eric Biggers
44df16de69 Merge "Log error message if setting project quota ID fails" am: 7505efbd5d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1694189

Change-Id: I64ee98eb6505837197aa509a8b9e21a952739966
2021-05-04 16:19:11 +00:00
Eric Biggers
7505efbd5d Merge "Log error message if setting project quota ID fails" 2021-05-04 16:06:14 +00:00
Songchun Fan
bcd8884b17 Merge "[vold] pass sysfs_name to mount options" into sc-dev am: 5c0e80571f
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/14329569

Change-Id: Iac54e371e9728bdf92570d0f1bf5172308562cad
2021-05-04 00:34:10 +00:00
Songchun Fan
5c0e80571f Merge "[vold] pass sysfs_name to mount options" into sc-dev 2021-05-04 00:14:40 +00:00
Eric Biggers
39aa9584b1 Log error message if setting project quota ID fails
Otherwise, the only sign of what went wrong may be system_server
logging a "ServiceSpecificException".

Bug: 187079978
Change-Id: I59b2ba2b0e679dfd1ec1fd8fff6790256fbfdf29
2021-05-03 12:39:36 -07:00
Ricky Wai
23356377ae Only kill apps with storage app data isolation enabled
Originally it kills all the apps with obb and data mounted.
Due to recent changes, all apps will have obb and data dirs mounted
in default root namespace. Hence all apps will be killed by
by KillProcessesWithMounts().

To fix this, we also check if the dir is mounted as tmpfs,
as the default namespace one is bind mounted to lowerfs,
which app data isolation is mounted as tmpfs, so we only
kill the process that have obb dir mounted as tmpfs.

Bug: 148049767
Test: Able to boot without warnings
Change-Id: I5f862ad6f64f5df739b68ea7c9815352bae3be5c
Merged-In: I45d9a63ed47cbc27aebb63357a43f51ad62275db
2021-04-30 13:58:07 +00:00
Ricky Wai
2d85b3cfc0 Merge "Only kill apps with storage app data isolation enabled" into sc-dev am: cebee9c533
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/14353409

Change-Id: I10982bd449db3391dd1c8726efe4a2d5c63b7829
2021-04-30 13:53:54 +00:00
Ricky Wai
a92ed67d4b Change mounting storage data and obb flag to on by default am: 4ae2c65f8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/14317138

Change-Id: I2f4a5ee5e0328711fc684d155996b2d6f211c005
2021-04-30 13:53:53 +00:00
Ricky Wai
cebee9c533 Merge "Only kill apps with storage app data isolation enabled" into sc-dev 2021-04-30 13:49:13 +00:00
Ricky Wai
a58b535495 Only kill apps with storage app data isolation enabled
Originally it kills all the apps with obb and data mounted.
Due to recent changes, all apps will have obb and data dirs mounted
in default root namespace. Hence all apps will be killed by
by KillProcessesWithMounts().

To fix this, we also check if the dir is mounted as tmpfs,
as the default namespace one is bind mounted to lowerfs,
which app data isolation is mounted as tmpfs, so we only
kill the process that have obb dir mounted as tmpfs.

Bug: 148049767
Test: Able to boot without warnings / errors
Ignore-AOSP-First: Merge it along with other CLs, will cherry-pick to
AOSP afterwards.

Change-Id: I45d9a63ed47cbc27aebb63357a43f51ad62275db
2021-04-30 10:06:32 +01:00
Ricky Wai
4ae2c65f8d Change mounting storage data and obb flag to on by default
Change mounting storage data and obb flag to on by default

Test: unbundled/launcher/nexus_unit_test_multi_device_platform
Test: atest android.appsecurity.cts.ExternalStorageHostTest
Test: atest AdoptableHostTest
Test: pass cts/cts_postsubmit_cf_stable-cloud-tf

Bug: 148049767
Ignore-AOSP-First: Merge it along with other CLs, will cherry-pick to
AOSP afterwards.

Change-Id: I6391b7381699b4ffdbf715b67938bc3f79a5210c
2021-04-29 15:59:13 +00:00
Songchun Fan
046e68abd6 [vold] pass sysfs_name to mount options
Ignore-AOSP-First: Will cherry-pick to AOSP

Test: manual
BUG: 184844615
Change-Id: I216210132f49f55098c0f2d1b8d4e571b22cfcc4
2021-04-29 08:35:43 -07:00
Treehugger Robot
ee2f2e081d Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549 am: 97455f85b0 am: f04542fcac
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1684055

Change-Id: I0762df0881f194acd1d1a13dc1eae54647ac02f6
2021-04-26 20:27:50 +00:00
Treehugger Robot
f04542fcac Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549 am: 97455f85b0
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1684055

Change-Id: Ia25afd08bb0a0400d24343f37aeea4246f3ec1e8
2021-04-26 19:50:00 +00:00
Treehugger Robot
97455f85b0 Merge "Fix cryptfs RSA signing with keystore2" am: d2bb367549
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1684055

Change-Id: Ib91a29bf3d216c09ece619b9554c8f391efbe5fd
2021-04-26 19:13:28 +00:00
Treehugger Robot
d2bb367549 Merge "Fix cryptfs RSA signing with keystore2" 2021-04-26 18:51:13 +00:00
Hasini Gunasinghe
33f9b160a2 Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8 am: 0e9eb8ebca am: d14ab5c35c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1681547

Change-Id: I26878bfc82857c05539c1a2705ddcb3fad0c3fb4
2021-04-23 23:48:18 +00:00
Hasini Gunasinghe
d14ab5c35c Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8 am: 0e9eb8ebca
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1681547

Change-Id: I8ee13ffd60784cee2ffbe8ff640b30a0f7716f5f
2021-04-23 23:25:35 +00:00
Hasini Gunasinghe
0e9eb8ebca Merge "Make vold use the updated keystore 2 API for storage keys." am: 68bdb45cf8
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1681547

Change-Id: Ib4156e85984c903cf521977e39522d013daf140c
2021-04-23 23:03:46 +00:00
Hasini Gunasinghe
68bdb45cf8 Merge "Make vold use the updated keystore 2 API for storage keys." 2021-04-23 22:39:04 +00:00
Eric Biggers
940c0e5f6e Fix cryptfs RSA signing with keystore2
Fix KeymasterOperation::updateCompletely() to not treat an empty output
as an error, since for RSA signing (used by cryptfs / FDE) it is
expected that the output from update() be empty.  The output is instead
produced at the end by finish().

This is one of a set of changes that is needed to get FDE working again
so that devices that launched with FDE can be upgraded to Android 12.

Bug: 186165644
Change-Id: Icf120f8b9526d051d0ebe16bc8ad1edf712241e1
2021-04-23 10:44:41 -07:00
Jaegeuk Kim
5b6c40e3c0 Merge "mkfs_f2fs: give the log in kernel" am: 177b9db866 am: b79f93bea9 am: 52b6cc4a8a
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1677035

Change-Id: Idc20fc59694a4fefb0118c9e18c948e3af8cd8fe
2021-04-20 23:20:48 +00:00
Jaegeuk Kim
52b6cc4a8a Merge "mkfs_f2fs: give the log in kernel" am: 177b9db866 am: b79f93bea9
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1677035

Change-Id: I10b8cf99a771b28e66a2c9a391b7c9d00281d492
2021-04-20 22:54:45 +00:00
Jaegeuk Kim
b79f93bea9 Merge "mkfs_f2fs: give the log in kernel" am: 177b9db866
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1677035

Change-Id: I55cce35d98afdf058854746e90c42be6c4f7d52c
2021-04-20 22:26:22 +00:00
Jaegeuk Kim
177b9db866 Merge "mkfs_f2fs: give the log in kernel" 2021-04-20 22:08:26 +00:00
Janis Danisevskis
3915b08f80 Make vold use the updated keystore 2 API for storage keys.
This CL updates vold to use the updated storage key API that provides an
optional upgraded key blob. In this patch the upgraded key blob is not
yet stored by vold.

Bug: 185811713
Test: N/A
Change-Id: I39eeb20df0eb2b023479f3adebab264d29d00048
2021-04-20 12:53:12 -07:00
Jaegeuk Kim
2c1380f1ab mkfs_f2fs: give the log in kernel
It's very useful to see the mkfs log in console to debug any issues.

Bug: 172378121
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Icdac3609860cf0bba3fa758cead885bd4960f2c0
2021-04-15 20:24:04 -07:00
Treehugger Robot
73eda071ef Merge "vold: add getUnlockedUsers() method to Binder interface" am: 5e5819a761 am: ffcb495f2c am: b22fa25e7b
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1674805

Change-Id: I46101eff7eaa690af8c3dc53442ba05d9a30bb8b
2021-04-15 04:42:14 +00:00
Treehugger Robot
b22fa25e7b Merge "vold: add getUnlockedUsers() method to Binder interface" am: 5e5819a761 am: ffcb495f2c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1674805

Change-Id: I6a28604fbf87bc8e299596eaed5261f2925676dd
2021-04-15 03:52:14 +00:00
Treehugger Robot
ffcb495f2c Merge "vold: add getUnlockedUsers() method to Binder interface" am: 5e5819a761
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1674805

Change-Id: I6b491e5939d3c878351bdfed3452e95ca8f19a89
2021-04-15 03:06:01 +00:00
Treehugger Robot
5e5819a761 Merge "vold: add getUnlockedUsers() method to Binder interface" 2021-04-15 02:33:22 +00:00
Eric Biggers
18ba15223c vold: add getUnlockedUsers() method to Binder interface
This is needed so that system_server can remind itself about which users
have their storage unlocked, if system_server is restarted due to a
userspace reboot (soft restart).

Bug: 146206679
Test: see I482ed8017f7bbc8f7d4fd5a2c0f58629317ce4ed
Change-Id: I02f0494d827094bd41bcfe5f63c24e204b728595
(cherry picked from commit 1799debfd6)
2021-04-13 10:53:00 -07:00
Eric Biggers
23d93638c5 Merge "vold: add getUnlockedUsers() method to Binder interface" into sc-dev 2021-04-13 17:52:02 +00:00
Eric Biggers
1799debfd6 vold: add getUnlockedUsers() method to Binder interface
This is needed so that system_server can remind itself about which users
have their storage unlocked, if system_server is restarted due to a
userspace reboot (soft restart).

Bug: 146206679
Test: see I482ed8017f7bbc8f7d4fd5a2c0f58629317ce4ed
Change-Id: I02f0494d827094bd41bcfe5f63c24e204b728595
2021-04-08 12:29:57 -07:00
Alex Buynytskyy
dcfeaa1d76 Adding an option to shorten the read timeout.
E.g. during installation to protect the system.

Ignore-AOSP-First: this depends on changes to framework and/or incfs and does not make sense without them. We'll merge it at a single large scale merge later.

Bug: 160635296
Test: atest PackageManagerShellCommandTest PackageManagerShellCommandIncrementalTest IncrementalServiceTest PackageManagerServiceTest ChecksumsTest

Change-Id: I5851e1e9dbc8e8c2b331c407002cf7133bf6e35a
2021-04-08 09:58:15 +00:00
Satya Tangirala
6a88ae1891 Merge changes from topic "vold-use-keystore2" am: 08873d0d7d am: 54460f0635 am: 10912a295f
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1649730

Change-Id: I3f8ea815c5c3de2678c11815ddaf41776d470552
2021-04-08 02:21:37 +00:00
Satya Tangirala
bcf02854e1 Make vold use keystore2 instead of keymaster am: e8de4ffd73 am: 7a8ac746a2 am: b79360f80c
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1640885

Change-Id: I7445d17137f563c5cb3f6d8e62f4bb92da2c2fa1
2021-04-08 02:21:36 +00:00
Satya Tangirala
dbbe0363bb Remove HardwareAuthToken support from vold::Keymaster am: e13617100d am: 695fadddf3 am: 57e480b3d5
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1640884

Change-Id: Ia1d707a541b18d29ad9643294f6868d48422fa78
2021-04-08 02:21:34 +00:00
Satya Tangirala
10912a295f Merge changes from topic "vold-use-keystore2" am: 08873d0d7d am: 54460f0635
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1649730

Change-Id: I8a70c04881275aa5e3bf4cf629316870798df27a
2021-04-08 01:36:42 +00:00
Satya Tangirala
b79360f80c Make vold use keystore2 instead of keymaster am: e8de4ffd73 am: 7a8ac746a2
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1640885

Change-Id: I7a45fdb9ed25c5543d0a9dda80106241f90e53db
2021-04-08 01:36:41 +00:00
Satya Tangirala
57e480b3d5 Remove HardwareAuthToken support from vold::Keymaster am: e13617100d am: 695fadddf3
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1640884

Change-Id: I84747f3ea29f6b78f8f1a9bb11959a46ec8c3189
2021-04-08 01:36:40 +00:00
Satya Tangirala
54460f0635 Merge changes from topic "vold-use-keystore2" am: 08873d0d7d
Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1649730

Change-Id: Ie7db671fc7e90fa86cf84773786ea6afaab37a7f
2021-04-08 00:52:41 +00:00