Changes for July 2022, syncing up to v415

This commit is contained in:
Andy CrossGate Yan
2022-07-21 23:51:47 +00:00
parent c40dad91ee
commit 6d6652514e
69 changed files with 240 additions and 134 deletions

View File

@@ -1,4 +1,4 @@
From 990be9e3d37ce43afb37303b3503f0999bc82ca2 Mon Sep 17 00:00:00 2001
From c4f1b9d1e0fecc819f41781aab3e5251b0bd0bb1 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 17 Feb 2018 19:39:38 +0100
Subject: [PATCH 1/7] Allow deletion of symlink
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
1 file changed, 1 insertion(+)
diff --git a/FsCrypt.cpp b/FsCrypt.cpp
index 04def5c4..c7de48e1 100644
index 09dcf818..2ca58947 100644
--- a/FsCrypt.cpp
+++ b/FsCrypt.cpp
@@ -315,6 +315,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
@@ -323,6 +323,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
static bool destroy_dir(const std::string& dir) {
LOG(DEBUG) << "Destroying: " << dir;
if (rmdir(dir.c_str()) != 0 && errno != ENOENT) {

View File

@@ -1,4 +1,4 @@
From c31e214cb0f52671514b06ebc6b4e03bddf491bf Mon Sep 17 00:00:00 2001
From cc8870fbad8382da092438af78381fac9bbee251 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 20 Aug 2018 22:37:54 +0200
Subject: [PATCH 2/7] Support Samsung's implementation of exfat, called sdfat

View File

@@ -1,4 +1,4 @@
From 457e5c667aa50a8e944a5a20dadb6e0c4cefd7b4 Mon Sep 17 00:00:00 2001
From abc668333338ec0ee2c8a4042551eea0a924eccc Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 28 Jan 2020 00:27:17 +0100
Subject: [PATCH 3/7] Sony has `texfat` exfat fs

View File

@@ -1,4 +1,4 @@
From 5684e411afc3cdcf5e66e9bade31fde768c3373b Mon Sep 17 00:00:00 2001
From 75a4589a6a6bbde9b1273c64dce37ab80d5342a0 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Sat, 7 Mar 2020 14:49:09 +0100
Subject: [PATCH 4/7] Failing to create facedata shouldn't be fatal

View File

@@ -1,4 +1,4 @@
From 37b7e342b023af7f1c39335ab61e64e446057234 Mon Sep 17 00:00:00 2001
From d414bcc51b7527764055b20776cb71ec85580106 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 11 Mar 2020 14:02:35 +0100
Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
@@ -8,11 +8,11 @@ Subject: [PATCH 5/7] Every voldmanaged storage is adoptable
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index 1f85fb53..52aa896d 100644
index dc63caef..3af0dcf3 100644
--- a/main.cpp
+++ b/main.cpp
@@ -257,7 +257,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
std::string nickname(entry.label);
@@ -263,7 +263,7 @@ static int process_config(VolumeManager* vm, VoldConfigs* configs) {
int partnum = entry.partnum;
int flags = 0;
- if (entry.is_encryptable()) {

View File

@@ -1,24 +1,23 @@
From 02318d958b630413efe73d0454a277f1b9d8e020 Mon Sep 17 00:00:00 2001
From 968689281ef36e9de7743419137eba72c3472803 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Wed, 24 Nov 2021 15:50:30 -0500
Subject: [PATCH 6/7] Log support for exfat/texfat FS driver names
Change-Id: I5ae38741374b25b84595a9eae9bdda7afe2cac05
---
main.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/main.cpp b/main.cpp
index 52aa896d..86e0aa52 100644
index 3af0dcf3..05b2db62 100644
--- a/main.cpp
+++ b/main.cpp
@@ -69,7 +69,9 @@ int main(int argc, char** argv) {
LOG(DEBUG) << "Detected support for:"
@@ -71,7 +71,8 @@ int main(int argc, char** argv) {
<< (android::vold::IsFilesystemSupported("ext4") ? " ext4" : "")
<< (android::vold::IsFilesystemSupported("f2fs") ? " f2fs" : "")
<< (android::vold::IsFilesystemSupported("ntfs") ? " ntfs" : "")
- << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "");
+ << (android::vold::IsFilesystemSupported("vfat") ? " vfat" : "")
+ << (android::vold::IsFilesystemSupported("exfat") ? " exfat" : "")
+ << (android::vold::IsFilesystemSupported("texfat") ? " texfat" : "");
VolumeManager* vm;

View File

@@ -1,4 +1,4 @@
From 9612422f1e17dffdf5ed00c4c3abd1c2f3a17656 Mon Sep 17 00:00:00 2001
From aecee9a897b803b4e65fcd21357c76226e8c4e4c Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Mon, 29 Nov 2021 17:49:13 -0500
Subject: [PATCH 7/7] Don't unmount rw-system.sh binds
@@ -9,10 +9,10 @@ Change-Id: If9132c21defa8b09879b79a70794c5275d6852d0
1 file changed, 1 insertion(+)
diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index 2697f672..d592c7f5 100644
index 036c313f..70f33e38 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -957,6 +957,7 @@ int VolumeManager::unmountAll() {
@@ -962,6 +962,7 @@ int VolumeManager::unmountAll() {
while ((mentry = getmntent(fp)) != NULL) {
auto test = std::string(mentry->mnt_dir);
if ((StartsWith(test, "/mnt/") &&