Commit graph

3343 commits

Author SHA1 Message Date
Nikita Ioffe
f850e6e564 Allow fscrypt_mount_metadata_encrypted to be called more than once
In case of userspace reboot, this function will be called again to
remount userdata into checkpoint mode.

Test: adb shell setprop sys.init.userdata_remount.force_umount_f2fs 1
Test: adb shell /system/bin/vdc checkpoint startCheckpoint 1
Test: adb reboot userspace
Test: adb shell dumpsys activity
Bug: 135984674
Bug: 143970043
Change-Id: I300b1960a6c4e95b13c43d806c4f3a9e4a612ac4
2019-12-09 21:19:11 +00:00
Songchun Fan
1119bc8531 Merge "[incremental] use vold to mount/unmount IncrementalFileSystem" am: 6bdfb77d8b
am: a0945f468a

Change-Id: I4244844cde78dc46cac88299fa1fd2e2eee9af26
2019-12-06 00:05:07 -08:00
Songchun Fan
a0945f468a Merge "[incremental] use vold to mount/unmount IncrementalFileSystem"
am: 6bdfb77d8b

Change-Id: Ic9abd7f6e502e9f051effa998e3fbd40746d57d7
2019-12-06 00:03:15 -08:00
Songchun Fan
6bdfb77d8b Merge "[incremental] use vold to mount/unmount IncrementalFileSystem" 2019-12-06 06:45:37 +00:00
Songchun Fan
ab55cecdc1 [incremental] use vold to mount/unmount IncrementalFileSystem
Let vold mount IncFs onto directories under data and open control files.

Test: builds
Change-Id: Ibd96aae254b4fefaf56c9d549c4672a987c46221
2019-12-04 14:01:22 -08:00
Nikita Ioffe
961806fdc9 Merge "Add '/system/bin/vdc volume reset' command" am: d21a8a495d
am: 86bad28329

Change-Id: I589bc0973050eea50147f927cf2044949ca4d7e0
2019-12-04 12:18:28 -08:00
Nikita Ioffe
86bad28329 Merge "Add '/system/bin/vdc volume reset' command"
am: d21a8a495d

Change-Id: I21fde79cd170bdfcd8a32b8a85da56099a223e2d
2019-12-04 11:52:20 -08:00
Nikita Ioffe
d21a8a495d Merge "Add '/system/bin/vdc volume reset' command" 2019-12-04 19:22:50 +00:00
Oli Lan
ac003c4955 Create directories for snapshots of DE_n and CE_n apex data.
This creates apexrollback directories under /data/misc_[de|ce]/<user>
which will hold snapshots of DE_n and CE_n apex data directories
(i.e. it will hold backups of data from /data/misc_[de|ce]/<user>/apexdata
for particular apexes).

See go/apex-data-directories for details.

Bug: 141148175
Test: Built and flashed, checked directory was created.
Change-Id: I468060b20dee0c50033b5f014ce8716582d5e6bc
2019-12-04 10:29:50 +00:00
Nikita Ioffe
7596581e9f Add '/system/bin/vdc volume reset' command
It will be used during the userspace reboot to unmount all emulated
storages, which is a prerequisite to unmount+remount ext4 userdata into
checkpoint mode.

Test: adb shell /system/bin/vdc checkpoint startCheckpoint 1
Test: adb reboot userspace
Bug: 143970043
Bug: 135984674
Change-Id: I07491bc4be2f30debe21b764766c9def68548e16
2019-12-02 11:51:20 +00:00
Oli Lan
94457217cb Create DE_n and CE_n APEX data directories.
This creates an apexdata directory under /data/misc_de/<user> and
/data/misc_ce/<user>, and also creates a directory under that for
every APEX that is installed.

See go/apex-data-directories.

APEXes are discovered by scanning the /apex directory. It may be better
to delegate this process to a library, but it is proposed to defer that
change to a future CL.

Bug: 141148175
Test: Built and flashed, checked directories were created.
Change-Id: I95a060b4f42241c91da25a779e61a8f85ca1914c
2019-11-21 14:07:18 +00:00
Janis Danisevskis
ffe6756d10 Merge "Removed obsolete Test" am: 6e3441a8ea
am: 9f5f518c19

Change-Id: I39bccf96f352b1000f2fdd64ffff92e20bbfc340
2019-11-18 16:28:28 -08:00
Janis Danisevskis
9f5f518c19 Merge "Removed obsolete Test"
am: 6e3441a8ea

Change-Id: I392f1737c5dfa6e7aee78c7b1af1b016f6f102e9
2019-11-18 16:22:14 -08:00
Treehugger Robot
6e3441a8ea Merge "Removed obsolete Test" 2019-11-19 00:11:11 +00:00
Janis Danisevskis
8c4eb2c2c0 Removed obsolete Test
The HidlizationEquivalenceTest was used to make sure the same key is
computed by the scrypt algorithm regardless of whether the old
(<= KM2 HAL pre treble) or the new (>= KM3.0 treble) HAL was used.
Since the treble is now the default, and old HAL don't even exist on
new devices, we should call the migration a success and drop this test
altogether.

Test: Removed obsolete Code
Bug: 68197448
Change-Id: If10c79bafac4d0c8268675cbb8e1c4b46974aab5
2019-11-18 22:53:30 +00:00
Tianjie Xu
09de0ff8d6 Clear the warm_reset flag after boot is successful
The property is set to inform kernel to do a warm_reset on the next
reboot. This is useful to persist the logs to debug device boot
failures. After the slot has been marked as boot successful, we can drop
the warm_reset flag to avoid the performance overhead on the next
reboot.

Bug: 143489994
Test: check the property is set to 0 by vold
Change-Id: If7c922f40bcf9a6f7894af0a334ab23d88d40d17
2019-11-15 14:06:02 -08:00
Zimuzo Ezeozue
b287ea6a02 Merge "Add zezeozue to OWNERS" am: f9972055f5
am: e8db702702

Change-Id: I0b6a7b06d1ce39e8e70e87a14b312425c55828d5
2019-11-15 08:32:59 -08:00
Zimuzo Ezeozue
e8db702702 Merge "Add zezeozue to OWNERS"
am: f9972055f5

Change-Id: I45c211d810f1a15e0b5a1f4decc33a0eece8dafd
2019-11-15 08:25:56 -08:00
Zimuzo Ezeozue
f9972055f5 Merge "Add zezeozue to OWNERS" 2019-11-15 16:06:59 +00:00
Zim
076967a823 Add zezeozue to OWNERS
Test: n/a
Change-Id: I75339fcea5d4e537c6312e8e515b6dd62d7ae7fc
2019-11-15 16:03:47 +00:00
shaozhongqi
42726be6a3 Merge "Exfat Need to add automatic repair function when exfat fsck device" am: 7e249ebdae
am: 8006c80960

Change-Id: I74cdf0596642b2db70f4507eefc8acd68ad1fe26
2019-11-08 15:22:25 -08:00
shaozhongqi
8006c80960 Merge "Exfat Need to add automatic repair function when exfat fsck device"
am: 7e249ebdae

Change-Id: I835a8717fb25b651ce815c9912322b84e9d66041
2019-11-08 15:18:28 -08:00
Treehugger Robot
7e249ebdae Merge "Exfat Need to add automatic repair function when exfat fsck device" 2019-11-08 22:43:45 +00:00
shaozhongqi
081cf8efdb Exfat Need to add automatic repair function when exfat fsck device
bug:143229109

Test: Manual

Change-Id: Ibf650bdcb378dd9c07f904bdd18b36f376b45b61
Signed-off-by: shaozhongqi <shaozhongqi@xiaomi.com>
2019-10-31 06:37:50 +00:00
Paul Crowley
ff5ad94627 Merge "Remove libfscrypt now it's in libfs_mgr" am: 43f8298bdd
am: ce187e7fd6

Change-Id: I67dab6b461cf9eebc91db8d922c100b786597f1d
2019-10-30 20:38:26 -07:00
Paul Crowley
ce187e7fd6 Merge "Remove libfscrypt now it's in libfs_mgr"
am: 43f8298bdd

Change-Id: I0eaafaa461fa2ec6153a3e3bf49926b2efc610b7
2019-10-30 20:31:55 -07:00
Paul Crowley
43f8298bdd Merge "Remove libfscrypt now it's in libfs_mgr" 2019-10-31 03:17:23 +00:00
Xin Li
ac868f7b3c DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: b89717b9c3

Change-Id: Ibaa7773225c1fa7b64bce5d23dc46afae27ffee4
2019-10-30 15:58:18 -07:00
Paul Crowley
8bf310b9f3 Remove libfscrypt now it's in libfs_mgr
Now that we include libfscrypt in libfs_mgr via whole_static_libs we
should not reference it directly.

Bug: 143307095
Test: treehugger
Change-Id: I4cd138b50131ec8ce7835d9604c89c99cae53212
2019-10-30 13:34:49 -07:00
Xin Li
b89717b9c3 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: Ib50f11f8f97ebd427da22b31e484777ef3210fe6
2019-10-30 11:50:46 -07:00
Paul Crowley
f3a6282a63 Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095 am: 18b8ad91b8
am: 2615e01740

Change-Id: I8b2664197f51ecf3379e0de0e4303c71f0e2302b
2019-10-28 21:15:25 -07:00
Paul Crowley
9c715f4b3a Replace "flags" property with "options" with same format as fstab am: f612b8b5ab am: 0ae752dcc3
am: d9261cd394

Change-Id: I0c25c833a30130c3a5aa3a47f260351734332dd4
2019-10-28 21:15:20 -07:00
Paul Crowley
2615e01740 Merge changes from topics "fscrypt-options", "fstab-options" am: c17827b095
am: 18b8ad91b8

Change-Id: Ic1e283752dd13c30ee79e6f95600e38580eec23d
2019-10-28 21:08:20 -07:00
Paul Crowley
d9261cd394 Replace "flags" property with "options" with same format as fstab am: f612b8b5ab
am: 0ae752dcc3

Change-Id: I6446dd9eeb08958ab0a4e5c6d222ec7bdc4d6547
2019-10-28 21:08:16 -07:00
Paul Crowley
18b8ad91b8 Merge changes from topics "fscrypt-options", "fstab-options"
am: c17827b095

Change-Id: I9a992f0da7b5199b40ce650c2eb20258cab2b562
2019-10-28 19:23:05 -07:00
Paul Crowley
0ae752dcc3 Replace "flags" property with "options" with same format as fstab
am: f612b8b5ab

Change-Id: I30c51da82bdeb27a2dae7251762bb1a5241afcb8
2019-10-28 19:22:55 -07:00
Paul Crowley
c17827b095 Merge changes from topics "fscrypt-options", "fstab-options"
* changes:
  Use new encryption_options fstab entry
  Replace "flags" property with "options" with same format as fstab
2019-10-29 02:00:36 +00:00
Paul Crowley
a50f6c3c2c Use new encryption_options fstab entry
Bug: 143307095
Test: change cuttlefish fstab
Change-Id: Ia40daafc9b573c40f29c74dc2ef513fba3fc2bf9
2019-10-28 13:36:35 -07:00
Nikita Ioffe
667dadb67a Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b am: 3dbe996112
am: 536830ac65

Change-Id: I3f9ee004ffef19b5e0f83cbb50e98a2939d2202b
2019-10-28 05:06:28 -07:00
Nikita Ioffe
536830ac65 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" am: f37dff724b
am: 3dbe996112

Change-Id: I2b4f95bd3edbbfe2c6843dc06cd9ad1a156ca532
2019-10-28 03:19:33 -07:00
Nikita Ioffe
3dbe996112 Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT"
am: f37dff724b

Change-Id: Iaa1ce493c5fc67e280e4e3d656f434ad86e74f80
2019-10-28 03:13:59 -07:00
Nikita Ioffe
f37dff724b Merge "Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT" 2019-10-28 09:55:34 +00:00
Xin Li
da152fccb0 [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours am: c21f19338e -s ours
am: a69c584aaa -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If55c2cd2bdc8cd6329ba62e34e8979cdd645e5b3
2019-10-26 23:54:41 -07:00
Xin Li
a69c584aaa [automerger skipped] Merge "Merge Coral/Flame into AOSP master" am: be4ff998ac -s ours
am: c21f19338e -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I520c3ad27bc01eef706f411e064584dcf6268ba3
2019-10-26 23:48:03 -07:00
Xin Li
c21f19338e [automerger skipped] Merge "Merge Coral/Flame into AOSP master"
am: be4ff998ac -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: If1bc31b59c868707ff2b4ee406bcad0fa9da25d3
2019-10-26 23:39:50 -07:00
Xin Li
ee393feadc [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours am: 119618a381 -s ours
am: b462c16fb6 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I852ab9b92bb553cc7f2fc6c5dd556e75356020b0
2019-10-26 23:19:41 -07:00
Xin Li
b462c16fb6 [automerger skipped] Merge Coral/Flame into AOSP master am: 8a9454c35c -s ours
am: 119618a381 -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I6719833c4f030b7cf0d14dce49956ea3f8362c1a
2019-10-26 22:54:29 -07:00
Xin Li
119618a381 [automerger skipped] Merge Coral/Flame into AOSP master
am: 8a9454c35c -s ours
am skip reason: change_id I7191bd73d8621831c5802e02817f459f1da32754 with SHA1 a2c2182b65 is in history

Change-Id: I0e4e568d378d9412f2239f37ba2c475ad4f5f30b
2019-10-26 22:36:06 -07:00
Xin Li
be4ff998ac Merge "Merge Coral/Flame into AOSP master" 2019-10-27 04:44:29 +00:00
Nikita Ioffe
e1fd48999b Rename ENFORCE_UID to ENFORCE_SYSTEM_OR_ROOT
A little bit more self-explanatory name that explicitly says that root
is also allowed.

Test: builds
Change-Id: Ice20ffcba2a0994c599dbebace252138ffd827de
Merged-In: Ice20ffcba2a0994c599dbebace252138ffd827de
2019-10-26 15:51:17 +01:00