From 4c48be14b42ee496a5c6c86083656e9f4e66380a Mon Sep 17 00:00:00 2001
From: flawedworld <flawedworld@flawed.world>
Date: Sun, 30 Jan 2022 14:41:51 +0000
Subject: [PATCH] Cleanup

---
 config/common/file-removal.yml | 12 +++++++++---
 config/common/gen6pixel.yml    |  3 ---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config/common/file-removal.yml b/config/common/file-removal.yml
index dcd8185..1f56c04 100644
--- a/config/common/file-removal.yml
+++ b/config/common/file-removal.yml
@@ -6,6 +6,7 @@ filters:
       - product/etc/sysconfig/adaptivecharging.xml
       - product/etc/sysconfig/dreamliner.xml
       - product/etc/sysconfig/game_overlay.xml
+      - product/etc/sysconfig/quick_tap.xml
       # Boot animation
       - product/media/bootanimation.zip
       - product/media/bootanimation-dark.zip
@@ -15,19 +16,22 @@ filters:
       - system_ext/etc/init/init.sota.rc
       - system_ext/etc/permissions/com.google.android.factoryota.xml
       # Unused Google Dialer jar
+      - product/etc/permissions/com.google.android.dialer.support.xml
       - product/framework/com.google.android.dialer.support.jar
       # Unused hardware info jar
+      - product/etc/permissions/com.google.android.hardwareinfo.xml
       - product/framework/libhwinfo.jar
-      # Unused ok google blobs
+      # Unused ok google jar
       - system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml
       - system_ext/framework/com.android.hotwordenrollment.common.util.jar
-      # Unwanted OMA-DM // carrier trash
+      # Unused RadioConfigLib.jar
       - system_ext/etc/permissions/com.android.omadm.radioconfig.xml
       - system_ext/framework/RadioConfigLib.jar
+      # Unwanted OMA-DM permissions
       - product/etc/permissions/com.android.omadm.service.xml
       - product/etc/permissions/com.google.omadm.trigger.xml
       - product/etc/sysconfig/allowlist_com.android.omadm.service.xml
-      - product/etc/sysconfig/allowlist_com.android.omadm.service.xml
+      #  verizon carrier trash
       - product/etc/permissions/com.verizon.apn.xml
       - product/etc/permissions/com.verizon.services.xml
       - product/etc/permissions/com.customermobile.preload.vzw.xml
@@ -51,6 +55,8 @@ filters:
       - .ogg
 
     prefix:
+      # fs-verity certs for play store
+      - product/etc/security/fsverity
       # APEX
       - system/apex/
       # Fonts
diff --git a/config/common/gen6pixel.yml b/config/common/gen6pixel.yml
index 236c37d..cdda2bb 100644
--- a/config/common/gen6pixel.yml
+++ b/config/common/gen6pixel.yml
@@ -17,8 +17,6 @@ filters:
       - product/etc/permissions/com.android.sdm.plugins.dcmo.xml
       - product/etc/permissions/com.android.sdm.plugins.diagmon.xml
       - product/etc/permissions/com.google.android.apps.dreamliner.xml
-      - product/etc/permissions/com.google.android.dialer.support.xml
-      - product/etc/permissions/com.google.android.hardwareinfo.xml
       - product/etc/permissions/com.google.android.odad.xml
       - product/etc/permissions/privapp-permissions-google-p.xml
       - product/etc/permissions/split-permissions-google.xml
@@ -38,7 +36,6 @@ filters:
       - product/etc/sysconfig/nga.xml
       - product/etc/sysconfig/google_build.xml
       - product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
-      - product/etc/sysconfig/quick_tap.xml
       - system_ext/etc/permissions/privapp-permissions-google-se.xml
       - vendor/etc/fstab.gs101-fips
       # eSIM