DivestOS/Patches/LineageOS-18.1/android_packages_services_Telephony/0001-CC2.patch
Tavi e96e53ff68
Backport CarrierConfig2 to 18.1 and 19.1
Signed-off-by: Tavi <tavi@divested.dev>
2024-06-25 08:40:49 -04:00

41 lines
1.8 KiB
Diff

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tavi <tavi@divested.dev>
Date: Tue, 25 Jun 2024 02:39:28 -0400
Subject: [PATCH] Runtime control of platform carrier config package
Change-Id: I8cc8f2bda264bd42fe83d5c96fa6382e63a88410
Signed-off-by: Tavi <tavi@divested.dev>
---
src/com/android/phone/CarrierConfigLoader.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/com/android/phone/CarrierConfigLoader.java b/src/com/android/phone/CarrierConfigLoader.java
index 8d5b3307c..4ed2d20a4 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -41,6 +41,7 @@ import android.os.PersistableBundle;
import android.os.Process;
import android.os.RemoteException;
import android.os.ResultReceiver;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.preference.PreferenceManager;
import android.service.carrier.CarrierIdentifier;
@@ -645,8 +646,14 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub {
*/
private CarrierConfigLoader(Context context) {
mContext = context;
- mPlatformCarrierConfigPackage =
- mContext.getString(R.string.platform_carrier_config_package);
+ if (SystemProperties.getBoolean("persist.security.carrierconfig2", false)) {
+ mPlatformCarrierConfigPackage = "app.grapheneos.carrierconfig2";
+ } else {
+ //mPlatformCarrierConfigPackage = "com.android.carrierconfig";
+ mPlatformCarrierConfigPackage =
+ mContext.getString(R.string.platform_carrier_config_package);
+ }
+ Log.d("CarrierConfigPackageOverride", "Provider: " + mPlatformCarrierConfigPackage);
mHandler = new ConfigHandler();
IntentFilter bootFilter = new IntentFilter();