Regenerate patches

frameworks/base got too messy, time to clean it up
2021-02-14 10:41:04 +00:00
parent 85c08ba1de
commit 79b5b414a7
150 changed files with 615 additions and 881 deletions
@@ -1,7 +1,7 @@
-From c3b771c76088e9308759d9d59a79c67fe52514b6 Mon Sep 17 00:00:00 2001
+From 675dd5936da0e44ede6e6b15337bf0c4b1958706 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/6] Allow deletion of symlink
+Subject: [PATCH 1/9] Allow deletion of symlink

 Change-Id: I9731895f88729072297f753088583aabbe6990f4
 ---
@@ -9,10 +9,10 @@ Change-Id: I9731895f88729072297f753088583aabbe6990f4
 1 file changed, 1 insertion(+)

 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 2a8e110..8b061cb 100644
+index 76a02ba..5f95338 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -224,6 +224,7 @@ static bool prepare_dir(const std::string& dir, mode_t mode, uid_t uid, gid_t gi
+@@ -262,6 +262,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) {
@@ -21,5 +21,5 @@ index 2a8e110..8b061cb 100644
         return false;
     }
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From 95622cc1d194d74b5d7c38747c2b0ce14470d030 Mon Sep 17 00:00:00 2001
+From b287616ba4c0cb7a380b29b5ab70e98e6de90b75 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:53:12 +0200
-Subject: [PATCH 2/6] Don't set reserved_disk group, it panics old inits
+Subject: [PATCH 2/9] Don't set reserved_disk group, it panics old inits

 Change-Id: Ic4893136c188059d40d3e97099f7990dfa7432a8
 ---
@@ -18,5 +18,5 @@ index 93d8786..c27aeda 100644
     shutdown critical
 -    group root reserved_disk
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From 54e73dca9f6ec77bbd2f88d3daaef3c9c87979a1 Mon Sep 17 00:00:00 2001
+From 2a1b3675348541cb7fcb2cf2c2a759d9b9637ba0 Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Tue, 14 Aug 2018 20:54:08 +0200
-Subject: [PATCH 3/6] Create vendor_de. This is done by /init.rc on
+Subject: [PATCH 3/9] Create vendor_de. This is done by /init.rc on
 system-as-root device

 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 3/6] Create vendor_de. This is done by /init.rc on
 1 file changed, 2 insertions(+)

 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index 8b061cb..bb90ee0 100644
+index 5f95338..c5816b1 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -669,6 +669,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
+@@ -836,6 +836,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
         auto vendor_de_path = android::vold::BuildDataVendorDePath(user_id);
         auto user_de_path = android::vold::BuildDataUserDePath(volume_uuid, user_id);
 
@@ -22,5 +22,5 @@ index 8b061cb..bb90ee0 100644
             if (!prepare_dir(system_legacy_path, 0700, AID_SYSTEM, AID_SYSTEM)) return false;
 #if MANAGE_MISC_DIRS
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From 742595997f8f2380e0229e231848211c8126b92f Mon Sep 17 00:00:00 2001
+From 1cf770f79b0fa11efe64818eb6fd9a25bbcd3da7 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 4/6] Support Samsung's implementation of exfat, called sdfat
+Subject: [PATCH 4/9] Support Samsung's implementation of exfat, called sdfat

 ---
 fs/Exfat.cpp | 9 ++++++---
@@ -40,5 +40,5 @@ index c624eb9..b9844a5 100644
     }
 
 -- 
-2.17.1
+2.25.1

@@ -1,17 +1,17 @@
-From 1cdb0168b3bc3981f71aba62f51064be57ccf8f5 Mon Sep 17 00:00:00 2001
+From b11e5be450eaae1e0c099030d6de3c42ab77d9ae Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 20 Aug 2018 22:38:08 +0200
-Subject: [PATCH 5/6] Also create vendor_ce (same reason as vendor_de)
+Subject: [PATCH 5/9] Also create vendor_ce (same reason as vendor_de)

 ---
 FsCrypt.cpp | 2 ++
 1 file changed, 2 insertions(+)

 diff --git a/FsCrypt.cpp b/FsCrypt.cpp
-index bb90ee0..ec7ec7d 100644
+index c5816b1..92f31ea 100644
 --- a/FsCrypt.cpp
 +++ b/FsCrypt.cpp
-@@ -709,6 +709,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
+@@ -876,6 +876,8 @@ bool fscrypt_prepare_user_storage(const std::string& volume_uuid, userid_t user_
         auto media_ce_path = android::vold::BuildDataMediaCePath(volume_uuid, user_id);
         auto user_ce_path = android::vold::BuildDataUserCePath(volume_uuid, user_id);
 
@@ -21,5 +21,5 @@ index bb90ee0..ec7ec7d 100644
             if (!prepare_dir(system_ce_path, 0770, AID_SYSTEM, AID_SYSTEM)) return false;
             if (!prepare_dir(misc_ce_path, 01771, AID_SYSTEM, AID_MISC)) return false;
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From b48715b53228daedd29507239ceb1704453f4163 Mon Sep 17 00:00:00 2001
+From bc2a20304940acdba8100857599f7c24216547fd Mon Sep 17 00:00:00 2001
 From: Pierre-Hugues Husson <phh@phh.me>
 Date: Mon, 16 Sep 2019 13:49:05 +0200
-Subject: [PATCH] Check needsCheckpoint only if checkpoint is supported
+Subject: [PATCH 6/9] Check needsCheckpoint only if checkpoint is supported

 This is needed because some devices (Xiaomi MiPad 4, uncertified)
 declares a bootctrl HAL in manifest, but doesn't have it.
@@ -28,5 +28,5 @@ index ed9a53e..d2971ff 100644
         while ((mount_rc = fs_mgr_do_mount(&fstab_default, DATA_MNT_POINT, blkdev.data(), 0,
                                            needs_cp)) != 0) {
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From a60d2da9137661584aa536a9b6fb80f87960d197 Mon Sep 17 00:00:00 2001
+From 1e166b81f3f0c3a26d4f5ae7ba5757fb989eb977 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 7/7] Sony has `texfat` exfat fs
+Subject: [PATCH 7/9] Sony has `texfat` exfat fs

 ---
 fs/Exfat.cpp | 8 +++++++-
@@ -34,5 +34,5 @@ index b9844a5..e6f8450 100644
         return 0;
     }
 -- 
-2.17.1
+2.25.1

@@ -1,4 +1,4 @@
-From e4a3ff285cb25559117d38d573e79a6fc34cc9f5 Mon Sep 17 00:00:00 2001
+From 4978743f9f1561d35fee071e056d9358845b5697 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 8/9] Failing to create facedata shouldn't be fatal
@@ -34,5 +34,5 @@ index a620edd..e07528f 100644
         }
     }
 -- 
-2.17.1
+2.25.1

@@ -1,7 +1,7 @@
-From c9d44f78250d927f6ff1712a6097c33559500cdd Mon Sep 17 00:00:00 2001
+From cb15b47a3a92f502dab77024caf66abe38654ba3 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] Every voldmanaged storage is adoptable
+Subject: [PATCH 9/9] Every voldmanaged storage is adoptable

 ---
 main.cpp | 2 +-
@@ -21,5 +21,5 @@ index 4d61110..6f6e803 100644
                 *has_adoptable = true;
             }
 -- 
-2.17.1
+2.25.1