Eric Biggers
b288bf0f44
vold: rename from "ext4 encryption" to fscrypt am: a701c458ca
am: 10b70834a4
...
am: a51283d281
Change-Id: I346bca3f23cfe84d77e5de1e8ef601fb7debf620
2018-10-29 10:41:02 -07:00
Eric Biggers
a51283d281
vold: rename from "ext4 encryption" to fscrypt am: a701c458ca
...
am: 10b70834a4
Change-Id: I20fc4fef6b5bb5fd9062d0f1c6d83668a32e67dd
2018-10-29 10:36:49 -07:00
Eric Biggers
10b70834a4
vold: rename from "ext4 encryption" to fscrypt
...
am: a701c458ca
Change-Id: I2433a349e40e530439bdc84d39b6295213597b9e
2018-10-29 10:32:49 -07:00
Sudheer Shanka
9565b1f157
Merge "Update StorageManagerService handling of packages info."
2018-10-26 17:29:24 +00:00
Eric Biggers
a701c458ca
vold: rename from "ext4 encryption" to fscrypt
...
We support file-based encryption on both ext4 and f2fs now, and the
kernel API is the same. So rename things appropriately in vold:
e4crypt => fscrypt
ext4enc => fscrypt
Ext4Crypt => FsCrypt
EXT4_* => FS_*
ext4_encryption_key => fscrypt_key
Additionally, the common functions shared by 'vold' and 'init' are now
in libfscrypt rather than ext4_utils. So update vold to link to
libfscrypt and include the renamed headers.
Note: there's a chance of 'fscrypt' being confused with the dm-crypt
based encryption code in vold which is called 'cryptfs'. However,
fscrypt is the name used in the kernel for ext4/f2fs/ubifs encryption,
and it's preferable to use the same name in userspace.
Test: built, booted device with f2fs encryption
Change-Id: I2a46a49f30d9c0b73d6f6fe09e4a4904d4138ff6
2018-10-25 17:12:32 -07:00
Sudheer Shanka
69bc40f9a9
Update StorageManagerService handling of packages info.
...
Instead of maintaining local copy of all appIds and sandboxIds,
StorageManagerService will just get required packages info
from PackageManagerService when an user starts and passes it
to vold.
Bug: 117988901
Test: manual
Change-Id: Idab274529e843784c8804929e920c3af63032690
2018-10-25 11:58:43 -07:00
Bill Yi
894ecf121f
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0016efbc44
-s ours am: 92e9696929
-s ours
...
am: 5cd7febde2
-s ours
Change-Id: I4786d31888766d5b0d9000d48df1efcd644b74ca
2018-10-24 20:05:13 -07:00
Bill Yi
5cd7febde2
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0016efbc44
-s ours
...
am: 92e9696929
-s ours
Change-Id: I3f2318412bc9efd76c17138164bc9e605932361f
2018-10-24 19:07:48 -07:00
Bill Yi
92e9696929
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 0016efbc44
-s ours
Change-Id: I4f58d060b74eb50c3287390c205b90629a601304
2018-10-24 16:40:33 -07:00
Bill Yi
0016efbc44
Merge pie-platform-release to aosp-master - DO NOT MERGE
...
Change-Id: I112d144eac39f426e22d3a66e4fe298306010c13
2018-10-24 14:48:22 -07:00
Bill Yi
1395bb18d4
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE am: f7885c7757
-s ours
...
am: 02c6d9c484
-s ours
Change-Id: Ie98527a95b2ef0f918790dd1440883509e1bbb0b
2018-10-24 10:38:47 -07:00
Bill Yi
02c6d9c484
[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
am: f7885c7757
-s ours
Change-Id: I8be8bcca9f258cce95a9ec390f281034dc5f4fd7
2018-10-24 10:15:02 -07:00
Bill Yi
f7885c7757
Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
...
Change-Id: I535e6ec4e1ceed5e57d32353caaac7126752c7dc
2018-10-24 09:08:01 -07:00
Sudheer Shanka
51a38dada7
Update shared sandbox directory structure.
...
Sandboxes for apps with sharedUserIds will live
at Android/shared:sharedUserId/ instead of
Android/shared/sharedUserId/.
Bug: 117573457
Test: manual
Change-Id: I7ab920814b501b9cdd4c58fefe81c53162b318f3
2018-10-20 21:00:13 -07:00
Bill Yi
3ad56b76f0
Merge pi-dr1-dev to aosp-master am: 8b1136c831
am: 71e738ce4f
...
am: b4f22add1a
Change-Id: I80ca54e445fa19eb93b7d7a5c3b91a21577b2c7a
2018-10-19 15:22:45 -07:00
Bill Yi
b4f22add1a
Merge pi-dr1-dev to aosp-master am: 8b1136c831
...
am: 71e738ce4f
Change-Id: I181b22eda4668b23b9d7254b3eeadb64e5e8c382
2018-10-19 15:19:37 -07:00
Bill Yi
71e738ce4f
Merge pi-dr1-dev to aosp-master
...
am: 8b1136c831
Change-Id: I4459543720b4b50525087b3c8b9dd93ef5448f24
2018-10-19 15:04:46 -07:00
Bill Yi
8b1136c831
Merge pi-dr1-dev to aosp-master
...
Change-Id: I5f9eb0c7ea0a3ba88865854e28b73806011d323e
2018-10-19 12:20:56 -07:00
Daniel Rosenberg
5731a7a4e3
[automerger skipped] Merge "Remove spurious function declaration" am: 090e05bd02
-s ours am: aeac5d5f57
-s ours
...
am: ea1891bc2b
-s ours
Change-Id: Id9a5de792ec5a4cd9958eab922c423d0bb1b8cff
2018-10-16 17:39:16 -07:00
Daniel Rosenberg
ea1891bc2b
[automerger skipped] Merge "Remove spurious function declaration" am: 090e05bd02
-s ours
...
am: aeac5d5f57
-s ours
Change-Id: Ic5c0ceb3398da3c3a92e370b3d7edb70884f902c
2018-10-16 17:25:57 -07:00
Daniel Rosenberg
aeac5d5f57
[automerger skipped] Merge "Remove spurious function declaration"
...
am: 090e05bd02
-s ours
Change-Id: I919eeb0ec529c444ea0a32835a4b0306c07fab45
2018-10-16 17:12:32 -07:00
Treehugger Robot
090e05bd02
Merge "Remove spurious function declaration"
2018-10-16 23:55:28 +00:00
Daniel Rosenberg
1d4cd97354
[automerger skipped] Merge "Switch to exceptions for most cp calls" am: ece7e231a6
am: bc6c1ff8df
...
am: 99ae565fbf
-s ours
Change-Id: Id452e98ddddecac0644973cb3fa47f55b0bdcc6b
2018-10-16 14:48:06 -07:00
Daniel Rosenberg
99ae565fbf
Merge "Switch to exceptions for most cp calls" am: ece7e231a6
...
am: bc6c1ff8df
Change-Id: I7654daaedb0f23d8733f244782b9f74906cfee86
2018-10-16 14:40:05 -07:00
Daniel Rosenberg
bc6c1ff8df
Merge "Switch to exceptions for most cp calls"
...
am: ece7e231a6
Change-Id: Ib02d0a002f31834bb07cf8dd9446cec942880a77
2018-10-16 14:34:54 -07:00
Daniel Rosenberg
3bfb996597
Remove spurious function declaration
...
Test: Nothing changes
Change-Id: I27f0d832d33099efe25794987c307d773b5d987c
Merged-In: Icba16578608a6cbf922472e9d4ae5b8cf5f016c6
2018-10-16 21:28:13 +00:00
Treehugger Robot
ece7e231a6
Merge "Switch to exceptions for most cp calls"
2018-10-16 21:14:34 +00:00
Daniel Rosenberg
73680ec382
Switch to exceptions for most cp calls
...
This switches the checkpoint calls that don't need to return a value
to return 0 on success, and an error on failure. This will be transalted
to exceptions for java binder users. needsCheckpoint and needsRollback
still return a boolean value.
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: Idd3b5e6036631562a86d5123f533b86cf3bd6032
Merged-In: Idd3b5e6036631562a86d5123f533b86cf3bd6032
2018-10-16 20:06:47 +00:00
Daniel Rosenberg
e334aab65b
Switch to exceptions for most cp calls
...
This switches the checkpoint calls that don't need to return a value
to return 0 on success, and an error on failure. This will be transalted
to exceptions for java binder users. needsCheckpoint and needsRollback
still return a boolean value.
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: Idd3b5e6036631562a86d5123f533b86cf3bd6032
2018-10-16 08:31:14 -07:00
Daniel Rosenberg
cf540f3513
Merge "Handle retry count" am: e74587af4d
am: e1e3dc3698
...
am: c879ec2005
Change-Id: Ib1a614d3e3a964afc36585c9ca323e7a4cf97a39
2018-10-15 22:30:14 -07:00
Daniel Rosenberg
c879ec2005
Merge "Handle retry count" am: e74587af4d
...
am: e1e3dc3698
Change-Id: I22e6a5ca7502bec0d12b443652dd5c9c7a6b546b
2018-10-15 21:36:13 -07:00
Daniel Rosenberg
e1e3dc3698
Merge "Handle retry count"
...
am: e74587af4d
Change-Id: I76c8625e58de0efb7b1d937ce7bcb8499c7fc279
2018-10-15 21:19:59 -07:00
Treehugger Robot
e74587af4d
Merge "Handle retry count"
2018-10-16 01:25:34 +00:00
Daniel Rosenberg
80d1ca5600
Handle retry count
...
Test: vdc setCheckpoint 2 then reboot 3 times checking state
Bug: 112901762
Change-Id: I85a71d059bca27b76175b9bd8465cc453f0ddb8d
2018-10-15 22:13:41 +00:00
Rubin Xu
ffd236627b
[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87
am: 89858102c2
-s ours am: 74b92dc85f
...
am: 8b6ebe4817
-s ours
Change-Id: I0bc1909d13844722a1d3dbfb14c53aa853aa0cfe
2018-10-11 16:47:22 -07:00
Rubin Xu
29e2211ee9
[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
am: 0d2edbd6ab
am: b078fd6b8c
am: 6460a0149b
-s ours am: a815fe5d4c
...
am: 74c3059924
-s ours
Change-Id: I1edfdbc1b6304a40bfbdcdf5c5aa8f0051241448
2018-10-11 16:47:09 -07:00
Rubin Xu
8b6ebe4817
[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87
am: 89858102c2
-s ours
...
am: 74b92dc85f
Change-Id: I85b41ec11c18f0b2d98fbc15b1ae4141d23a823c
2018-10-11 16:28:26 -07:00
Rubin Xu
74c3059924
[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
am: 0d2edbd6ab
am: b078fd6b8c
am: 6460a0149b
-s ours
...
am: a815fe5d4c
Change-Id: I51930801459c5304c79e0d713d9f0a74b678b8e0
2018-10-11 16:28:05 -07:00
Rubin Xu
74b92dc85f
[automerger skipped] Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
am: b1498d1d87
...
am: 89858102c2
-s ours
Change-Id: Idf0858840a8472059899bfd565e4182c2c210693
2018-10-11 16:24:06 -07:00
Rubin Xu
a815fe5d4c
[automerger skipped] [automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
am: 0d2edbd6ab
am: b078fd6b8c
...
am: 6460a0149b
-s ours
Change-Id: Ie581371ca539f2513758529dad38dca903b8dac9
2018-10-11 16:23:55 -07:00
Rubin Xu
89858102c2
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev am: 92e63e3f9b
...
am: b1498d1d87
Change-Id: Ic7ef94c42d54d4f29c92bad98001bd6e065f5013
2018-10-11 16:16:03 -07:00
Rubin Xu
6460a0149b
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
am: 0d2edbd6ab
...
am: b078fd6b8c
Change-Id: I163ea50aca6838abcf0c58e042a5fe386f661afe
2018-10-11 16:15:48 -07:00
Rubin Xu
b1498d1d87
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev
...
am: 92e63e3f9b
Change-Id: Ia169a9fc152f100a9567f2c47ef5a2e46358aa52
2018-10-11 16:10:57 -07:00
Rubin Xu
b078fd6b8c
[automerger] [DO NOT MERGE] Fix signedness mismatch and integer underflow am: ef35553d53
am: 08bd47e9a9
am: 279cc3d65e
am: 972b5551f6
skipped: ded6cb5910
...
am: 0d2edbd6ab
Change-Id: I5f5e7425c927bdc6de7b401995fccc1f626355c7
2018-10-11 16:10:41 -07:00
TreeHugger Robot
92e63e3f9b
Merge "[DO NOT MERGE] Fix signedness mismatch and integer underflow" into oc-dev
2018-10-11 23:01:50 +00:00
TreeHugger Robot
1ddc09a3e4
Merge "Fix signedness mismatch and integer underflow"
2018-10-11 14:37:25 +00:00
Rubin Xu
19ef1ae99a
[DO NOT MERGE] Fix signedness mismatch and integer underflow
...
persist_get_max_entries() is supposed to return an unsigned integer as the
maximum number of entries but it also wrongly returns "-1" as an error
condition. Also fix an issue where an unsigned subtraction in this routine
could lead to integer underflow.
Bug: 112731440
Test: manual
Change-Id: I9672e39bef2c12156dda7806a08c52044962c178
2018-10-11 11:12:16 +01:00
Sudheer Shanka
b792c3a210
Merge "Delete package sandbox data when it is uninstalled."
2018-10-10 21:00:04 +00:00
Bill Rassieur
87135e28b2
Merge PPR2.181005.003 from pi-release-2 into pi-platform-release.
...
Change-Id: Ifb0130fa2b413d1b8a769684cffb6c6621ea9859
BUG: 117431430
2018-10-10 17:33:05 +00:00
Rubin Xu
d78181b82a
Fix signedness mismatch and integer underflow
...
persist_get_max_entries() is supposed to return an unsigned integer as the
maximum number of entries but it also wrongly returns "-1" as an error
condition. Also fix an issue where an unsigned subtraction in this routine
could lead to integer underflow.
Bug: 112731440
Test: manual
Change-Id: I9672e39bef2c12156dda7806a08c52044962c178
2018-10-10 14:14:26 +01:00