From 56b71651c51c9997dd242b2edaa6938ffaf47df9 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 30 Aug 2023 13:46:07 -0400
Subject: [PATCH] Tweak

Signed-off-by: Tad <tad@spotco.us>
---
 .../android_frameworks_base/0040-euicc-restrictions.patch | 4 ++--
 .../0017-OpenEUICC_Toggle.patch                           | 2 +-
 Scripts/Common/Deblob.sh                                  | 8 ++++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0040-euicc-restrictions.patch b/Patches/LineageOS-20.0/android_frameworks_base/0040-euicc-restrictions.patch
index f6f9a154..0d31b392 100644
--- a/Patches/LineageOS-20.0/android_frameworks_base/0040-euicc-restrictions.patch
+++ b/Patches/LineageOS-20.0/android_frameworks_base/0040-euicc-restrictions.patch
@@ -29,7 +29,7 @@ index ff8d96dd23f2..97027ebbca2d 100644
 +    </install-in-user-type>
  </config>
 diff --git a/services/core/java/com/android/server/ext/PackageManagerHooks.java b/services/core/java/com/android/server/ext/PackageManagerHooks.java
-index 007b65349e55..890d5a37a53b 100644
+index 007b65349e55..415a4d033e38 100644
 --- a/services/core/java/com/android/server/ext/PackageManagerHooks.java
 +++ b/services/core/java/com/android/server/ext/PackageManagerHooks.java
 @@ -6,6 +6,7 @@ import android.annotation.UserIdInt;
@@ -82,7 +82,7 @@ index 007b65349e55..890d5a37a53b 100644
 +                // this is the same as android:enabled="false" in <application> AndroidManifest tag,
 +                // it makes the package disabled by default on first boot, when there's no
 +                // serialized package state
-+                pkg.setEnabled(false);
++                pkg.setEnabled(SystemProperties.getBoolean(OPENEUICC_TOGGLE, false));
 +                return;
              default:
                  return;
diff --git a/Patches/LineageOS-20.0/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch b/Patches/LineageOS-20.0/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch
index 922556d2..72ac9870 100644
--- a/Patches/LineageOS-20.0/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch
+++ b/Patches/LineageOS-20.0/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch
@@ -48,7 +48,7 @@ index 604e8720e6..de90cec5bc 100644
      <Preference
 diff --git a/src/com/android/settings/security/OpenEuiccPreferenceController.java b/src/com/android/settings/security/OpenEuiccPreferenceController.java
 new file mode 100644
-index 0000000000..026d92b7d2
+index 0000000000..9ecfa96bfd
 --- /dev/null
 +++ b/src/com/android/settings/security/OpenEuiccPreferenceController.java
 @@ -0,0 +1,106 @@
diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh
index cab5c98a..7e643164 100644
--- a/Scripts/Common/Deblob.sh
+++ b/Scripts/Common/Deblob.sh
@@ -299,8 +299,12 @@ echo "Deblobbing...";
 		fi;
 	fi;
 
-	#Google Camera
-	blobs=$blobs"|com.google.android.camera.*|PixelCameraServices.*.apk";
+	#Google Camera (app)
+	blobs=$blobs"|com.google.android.camera.experimental.*";
+
+	#Google Camera (system) Extensions
+	blobs=$blobs"|PixelCameraServices.*.apk";
+	blobs=$blobs"|com.google.android.camera.extensions.*";
 
 	#Google NFC
 	blobs=$blobs"|PixelNfc.apk";