Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-07-24 23:25:34 -04:00
Code Issues Projects Releases Packages Wiki Activity

Backport CarrierConfig2 to 18.1 and 19.1

Browse source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-06-25 08:40:49 -04:00
parent 637ace8214
commit e96e53ff68
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
16 changed files with 879 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

211
Patches/LineageOS-18.1/android_packages_apps_CarrierConfig2/0001-Legacy-compat.patch Normal file
View file

@ -0,0 +1,211 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tavi <tavi@divested.dev>
Date: Tue, 25 Jun 2024 07:48:24 -0400
Subject: [PATCH] Legacy compat
Change-Id: Ic564f35a7d694cc99fc810b776bb6389efbfe3f1
Signed-off-by: Tavi <tavi@divested.dev>
---
.../grapheneos/carrierconfig2/ApnServiceImpl.java | 2 +-
.../carrierconfig2/CarrierServiceImpl.java | 12 +++---------
src/app/grapheneos/carrierconfig2/Utils.java | 6 +++---
src/app/grapheneos/carrierconfig2/loader/Apns.java | 9 +++------
.../carrierconfig2/loader/CarrierConfigLoader.java | 8 ++++----
.../grapheneos/carrierconfig2/loader/Filters.java | 7 ++-----
6 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
index 1fc2339..1ac28fc 100644
--- a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
+++ b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
@@ -21,7 +21,7 @@ public class ApnServiceImpl extends ApnService {
public List<ContentValues> onRestoreApns(int subId) {
Log.d(TAG, "onRestoreApns: subId " + subId);
- var csd = CSettingsDir.getDefault();
+ CSettingsDir csd = CSettingsDir.getDefault();
if (csd == null) {
Log.e(TAG, "CSettingsDir is missing");
return emptyList();
diff --git a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
index 166272f..37b430c 100644
--- a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
+++ b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
@@ -14,10 +14,10 @@ public class CarrierServiceImpl extends CarrierService {
@Nullable
@Override
- public PersistableBundle onLoadConfig(int subId, @Nullable CarrierIdentifier carrierId) {
- Log.d(TAG, "subId " + subId + "; carrierId " + carrierId);
+ public PersistableBundle onLoadConfig(@Nullable CarrierIdentifier carrierId) {
+ Log.d(TAG, "carrierId " + carrierId);
- var csd = CSettingsDir.getDefault();
+ CSettingsDir csd = CSettingsDir.getDefault();
if (csd == null) {
Log.e(TAG, "missing CSettingsDir");
return null;
@@ -25,10 +25,4 @@ public class CarrierServiceImpl extends CarrierService {
return new CarrierConfigLoader(getApplicationContext(), csd).load(carrierId);
}
-
- @Override
- public PersistableBundle onLoadConfig(CarrierIdentifier id) {
- // this method is deprecated and should never be called by the OS
- throw new IllegalStateException(String.valueOf(id));
- }
}
diff --git a/src/app/grapheneos/carrierconfig2/Utils.java b/src/app/grapheneos/carrierconfig2/Utils.java
index 7300925..06abf09 100644
--- a/src/app/grapheneos/carrierconfig2/Utils.java
+++ b/src/app/grapheneos/carrierconfig2/Utils.java
@@ -22,7 +22,7 @@ public class Utils {
return null;
}
- var tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
+ TelephonyManager tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
String simOperator = tm.getSimOperator();
if (simOperator == null) {
@@ -46,13 +46,13 @@ public class Utils {
String imsi = tm.getSubscriberId();
String gid1 = tm.getGroupIdLevel1();
- var res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null);
+ CarrierIdentifier res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null);
Log.d(TAG, "subId " + subId + "; " + res);
return res;
}
public static String printStackTraceToString(Throwable t) {
- var baos = new ByteArrayOutputStream(1000);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
t.printStackTrace(new PrintStream(baos));
return baos.toString();
}
diff --git a/src/app/grapheneos/carrierconfig2/loader/Apns.java b/src/app/grapheneos/carrierconfig2/loader/Apns.java
index ff0082f..357e6ea 100644
--- a/src/app/grapheneos/carrierconfig2/loader/Apns.java
+++ b/src/app/grapheneos/carrierconfig2/loader/Apns.java
@@ -39,7 +39,7 @@ public class Apns {
}
private static ContentValues apnItemToContentValues(ApnItem i, CarrierId protoCarrierId) {
- var cv = new ContentValues();
+ ContentValues cv = new ContentValues();
cv.put(Telephony.Carriers.APN, i.getValue());
cv.put(Telephony.Carriers.NAME, i.getName());
@@ -114,9 +114,6 @@ public class Apns {
int lntBitmask = i.hasLingeringNetworkTypeBitmask() ?
parseBitmaskString(i.getLingeringNetworkTypeBitmask()) : 0;
- cv.put(Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK, lntBitmask);
- cv.put(Telephony.Carriers.ALWAYS_ON, i.getAlwaysOn());
- cv.put(Telephony.Carriers.MTU_V6, i.getMtuV6());
return cv;
}
@@ -164,7 +161,7 @@ public class Apns {
private static List<ContentValues> getApnContentValues(CSettings cs) {
List<ApnItem> list = cs.protoCSettings.getApns().getApnList();
- var result = new ArrayList<ContentValues>(list.size());
+ ArrayList result = new ArrayList<ContentValues>(list.size());
for (ApnItem apnItem : list) {
result.add(apnItemToContentValues(apnItem, cs.carrierId2.protoCarrierId));
@@ -185,7 +182,7 @@ public class Apns {
}
private static String typesListToString(List<ApnItem.ApnType> list) {
- var b = new StringBuilder(list.size() * 5);
+ StringBuilder b = new StringBuilder(list.size() * 5);
boolean skipComma = true;
for (ApnItem.ApnType apnType : list) {
diff --git a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
index 1d77aac..97a07be 100644
--- a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
+++ b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
@@ -65,7 +65,7 @@ public class CarrierConfigLoader {
CSettings defaults = CSettings.get(csd, DEFAULT_CARRIER_ID);
- var bundle = new PersistableBundle();
+ PersistableBundle bundle = new PersistableBundle();
if (defaults != null) {
// settings for default carrier ID are used as a base, carrier-specific settings are
// applied on top
@@ -89,7 +89,7 @@ public class CarrierConfigLoader {
private PersistableBundle carrierConfigToBundle(CarrierConfig cc) {
List<CarrierConfig.Config> configs = cc.getConfigList();
- var bundle = new PersistableBundle(configs.size());
+ PersistableBundle bundle = new PersistableBundle(configs.size());
String TAG = "carrierConfigToBundle";
@@ -174,7 +174,7 @@ public class CarrierConfigLoader {
private void storeApnCSettingsVersion(CSettings cs) {
String k = cs.carrierId2.canonicalName;
SharedPreferences p = Prefs.get(context, Prefs.Namespace.APN_CSETTINGS_VERSIONS);
- var ed = p.edit();
+ SharedPreferences.Editor ed = p.edit();
if (p.getAll().size() > 100) {
// remove old values
ed.clear();
@@ -186,7 +186,7 @@ public class CarrierConfigLoader {
private void addVersionString(CSettings cSettings, boolean isDefault, PersistableBundle dest) {
CarrierSettings cs = cSettings.protoCSettings;
- var b = new StringBuilder();
+ StringBuilder b = new StringBuilder();
b.append(cs.getCanonicalName());
b.append('-');
b.append(cs.getVersion());
diff --git a/src/app/grapheneos/carrierconfig2/loader/Filters.java b/src/app/grapheneos/carrierconfig2/loader/Filters.java
index 75764db..02b92a9 100644
--- a/src/app/grapheneos/carrierconfig2/loader/Filters.java
+++ b/src/app/grapheneos/carrierconfig2/loader/Filters.java
@@ -23,12 +23,10 @@ class Filters {
case CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL:
case CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL:
case CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL:
- case CarrierConfigManager.KEY_HIDE_ENABLE_2G:
case CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL:
case CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL:
case CarrierConfigManager.KEY_HIDE_PRESET_APN_DETAILS_BOOL:
case CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL:
- case CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL:
case "com.google.android.dialer.display_wifi_calling_button_bool":
return null;
}
@@ -52,7 +50,6 @@ class Filters {
return null;
}
break;
- case CarrierConfigManager.KEY_CARRIER_PROVISIONING_APP_STRING:
case CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING:
case CarrierConfigManager.KEY_CARRIER_SETUP_APP_STRING:
case CarrierConfigManager.KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING:
@@ -107,7 +104,7 @@ class Filters {
}
private static boolean isSystemComponentName(Context ctx, String name) {
- var cn = ComponentName.unflattenFromString(name);
+ ComponentName cn = ComponentName.unflattenFromString(name);
if (cn == null) {
Log.w(TAG, "malformed ComponentName " + name);
return false;
@@ -117,7 +114,7 @@ class Filters {
private static boolean isSystemApp(Context ctx, String packageName) {
ApplicationInfo ai;
- var pm = ctx.getPackageManager();
+ PackageManager pm = ctx.getPackageManager();
try {
ai = pm.getApplicationInfo(packageName, 0);
} catch (PackageManager.NameNotFoundException e) {

173
Patches/LineageOS-18.1/android_packages_apps_Settings/0016-CC2_Toggle.patch Normal file
View file

@ -0,0 +1,173 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 20 Apr 2022 01:04:27 -0400
Subject: [PATCH] Add a toggle for CarrierConfig2 enablement
Copy and pasted from the GrapheneOS exec spawning toggle patch
TODO: MOVE OUT OF SECURITY CATEGORY
Change-Id: Ibea6ea9bed1c2ae3491f403d9e5c17c1d1c403f1
Signed-off-by: Tad <tad@spotco.us>
---
res/values/strings.xml | 3 +
res/xml/security_dashboard_settings.xml | 6 +
.../CarrierConfig2PreferenceController.java | 106 ++++++++++++++++++
.../settings/security/SecuritySettings.java | 1 +
4 files changed, 116 insertions(+)
create mode 100644 src/com/android/settings/security/CarrierConfig2PreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d2b61cc580..e07fd234aa0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11981,6 +11981,9 @@
<string name="sig_spoof_title">Unprivileged microG enablement</string>
<string name="sig_spoof_summary">Allows official builds of microG apps to function. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ <string name="carrierconfig2_title">Enable CarrierConfig2</string>
+ <string name="carrierconfig2_summary">Use a larger Google database instead of the AOSP database for carrier specific configurations. May improve cellular network compatibility &amp; functionality. Requires reboot.</string>
+
<!-- Title for the top level Privacy Settings [CHAR LIMIT=30]-->
<string name="privacy_dashboard_title">Privacy</string>
<!-- Summary for the top level Privacy Settings [CHAR LIMIT=NONE]-->
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 21ce054889c..892ea57cf20 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -87,6 +87,12 @@
android:title="@string/sig_spoof_title"
android:summary="@string/sig_spoof_summary"
android:persistent="false" />
+
+ <SwitchPreference
+ android:key="carrierconfig2"
+ android:title="@string/carrierconfig2_title"
+ android:summary="@string/carrierconfig2_summary"
+ android:persistent="false" />
</PreferenceCategory>
<!-- work profile security section -->
diff --git a/src/com/android/settings/security/CarrierConfig2PreferenceController.java b/src/com/android/settings/security/CarrierConfig2PreferenceController.java
new file mode 100644
index 00000000000..a3e5aa17591
--- /dev/null
+++ b/src/com/android/settings/security/CarrierConfig2PreferenceController.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.security;
+
+import android.content.Context;
+
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.SystemProperties;
+
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class CarrierConfig2PreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin, OnResume, Preference.OnPreferenceChangeListener {
+
+ private static final String SYS_KEY_CARRIERCONFIG2_ENABLE = "persist.security.carrierconfig2";
+ private static final String PREF_KEY_CARRIERCONFIG2_ENABLE = "carrierconfig2";
+ private static final String PREF_KEY_SECURITY_CATEGORY = "security_category";
+
+ private PreferenceCategory mSecurityCategory;
+ private SwitchPreference mCarrierConfig2Enable;
+ private boolean mIsAdmin;
+ private UserManager mUm;
+
+ public CarrierConfig2PreferenceController(Context context) {
+ super(context);
+ mUm = UserManager.get(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mSecurityCategory = screen.findPreference(PREF_KEY_SECURITY_CATEGORY);
+ updatePreferenceState();
+ }
+
+ @Override
+ public boolean isAvailable() {
+ mIsAdmin = mUm.isAdminUser();
+ return mIsAdmin;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREF_KEY_CARRIERCONFIG2_ENABLE;
+ }
+
+ // TODO: should we use onCreatePreferences() instead?
+ private void updatePreferenceState() {
+ if (mSecurityCategory == null) {
+ return;
+ }
+
+ if (mIsAdmin) {
+ mCarrierConfig2Enable = (SwitchPreference) mSecurityCategory.findPreference(PREF_KEY_CARRIERCONFIG2_ENABLE);
+ mCarrierConfig2Enable.setChecked(SystemProperties.getInt(SYS_KEY_CARRIERCONFIG2_ENABLE, 0) == 1);
+ } else {
+ mSecurityCategory.removePreference(mSecurityCategory.findPreference(PREF_KEY_CARRIERCONFIG2_ENABLE));
+ }
+ }
+
+ @Override
+ public void onResume() {
+ updatePreferenceState();
+ if (mCarrierConfig2Enable != null) {
+ boolean mode = mCarrierConfig2Enable.isChecked();
+ SystemProperties.set(SYS_KEY_CARRIERCONFIG2_ENABLE, mode ? "1" : "0");
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object value) {
+ final String key = preference.getKey();
+ if (PREF_KEY_CARRIERCONFIG2_ENABLE.equals(key)) {
+ final boolean mode = !mCarrierConfig2Enable.isChecked();
+ SystemProperties.set(SYS_KEY_CARRIERCONFIG2_ENABLE, mode ? "1" : "0");
+ }
+ return true;
+ }
+}
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index 5248d74c376..fcf244e720b 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -123,6 +123,7 @@ public class SecuritySettings extends DashboardFragment {
securityPreferenceControllers.add(new NativeDebugPreferenceController(context));
securityPreferenceControllers.add(new HostsPreferenceController(context));
securityPreferenceControllers.add(new SigSpoofPreferenceController(context));
+ securityPreferenceControllers.add(new CarrierConfig2PreferenceController(context));
controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY)
.setChildren(securityPreferenceControllers));
controllers.addAll(securityPreferenceControllers);

40
Patches/LineageOS-18.1/android_packages_services_Telephony/0001-CC2.patch Normal file
View file

@ -0,0 +1,40 @@
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();

185
Patches/LineageOS-19.1/android_packages_apps_CarrierConfig2/0001-Legacy-compat.patch Normal file
View file

@ -0,0 +1,185 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tavi <tavi@divested.dev>
Date: Tue, 25 Jun 2024 07:48:24 -0400
Subject: [PATCH] Legacy compat
Change-Id: Ic564f35a7d694cc99fc810b776bb6389efbfe3f1
Signed-off-by: Tavi <tavi@divested.dev>
---
.../grapheneos/carrierconfig2/ApnServiceImpl.java | 2 +-
.../carrierconfig2/CarrierServiceImpl.java | 12 +++---------
src/app/grapheneos/carrierconfig2/Utils.java | 6 +++---
src/app/grapheneos/carrierconfig2/loader/Apns.java | 9 +++------
.../carrierconfig2/loader/CarrierConfigLoader.java | 8 ++++----
.../grapheneos/carrierconfig2/loader/Filters.java | 7 ++-----
6 files changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
index 1fc2339..1ac28fc 100644
--- a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
+++ b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java
@@ -21,7 +21,7 @@ public class ApnServiceImpl extends ApnService {
public List<ContentValues> onRestoreApns(int subId) {
Log.d(TAG, "onRestoreApns: subId " + subId);
- var csd = CSettingsDir.getDefault();
+ CSettingsDir csd = CSettingsDir.getDefault();
if (csd == null) {
Log.e(TAG, "CSettingsDir is missing");
return emptyList();
diff --git a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
--- a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
+++ b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java
@@ -14,10 +14,10 @@ public class CarrierServiceImpl extends CarrierService {
@Nullable
@Override
- public PersistableBundle onLoadConfig(int subId, @Nullable CarrierIdentifier carrierId) {
- Log.d(TAG, "subId " + subId + "; carrierId " + carrierId);
+ public PersistableBundle onLoadConfig(@Nullable CarrierIdentifier carrierId) {
+ Log.d(TAG, "carrierId " + carrierId);
- var csd = CSettingsDir.getDefault();
+ CSettingsDir csd = CSettingsDir.getDefault();
if (csd == null) {
Log.e(TAG, "missing CSettingsDir");
return null;
@@ -25,10 +25,4 @@ public class CarrierServiceImpl extends CarrierService {
return new CarrierConfigLoader(getApplicationContext(), csd).load(carrierId);
}
-
- @Override
- public PersistableBundle onLoadConfig(CarrierIdentifier id) {
- // this method is deprecated and should never be called by the OS
- throw new IllegalStateException(String.valueOf(id));
- }
}
diff --git a/src/app/grapheneos/carrierconfig2/Utils.java b/src/app/grapheneos/carrierconfig2/Utils.java
--- a/src/app/grapheneos/carrierconfig2/Utils.java
+++ b/src/app/grapheneos/carrierconfig2/Utils.java
@@ -22,7 +22,7 @@ public class Utils {
return null;
}
- var tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
+ TelephonyManager tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId);
String simOperator = tm.getSimOperator();
if (simOperator == null) {
@@ -46,13 +46,13 @@ public class Utils {
String imsi = tm.getSubscriberId();
String gid1 = tm.getGroupIdLevel1();
- var res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null);
+ CarrierIdentifier res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null);
Log.d(TAG, "subId " + subId + "; " + res);
return res;
}
public static String printStackTraceToString(Throwable t) {
- var baos = new ByteArrayOutputStream(1000);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(1000);
t.printStackTrace(new PrintStream(baos));
return baos.toString();
}
diff --git a/src/app/grapheneos/carrierconfig2/loader/Apns.java b/src/app/grapheneos/carrierconfig2/loader/Apns.java
--- a/src/app/grapheneos/carrierconfig2/loader/Apns.java
+++ b/src/app/grapheneos/carrierconfig2/loader/Apns.java
@@ -39,7 +39,7 @@ public class Apns {
}
private static ContentValues apnItemToContentValues(ApnItem i, CarrierId protoCarrierId) {
- var cv = new ContentValues();
+ ContentValues cv = new ContentValues();
cv.put(Telephony.Carriers.APN, i.getValue());
cv.put(Telephony.Carriers.NAME, i.getName());
@@ -114,9 +114,6 @@ public class Apns {
int lntBitmask = i.hasLingeringNetworkTypeBitmask() ?
parseBitmaskString(i.getLingeringNetworkTypeBitmask()) : 0;
- cv.put(Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK, lntBitmask);
- cv.put(Telephony.Carriers.ALWAYS_ON, i.getAlwaysOn());
- cv.put(Telephony.Carriers.MTU_V6, i.getMtuV6());
return cv;
}
@@ -164,7 +161,7 @@ public class Apns {
private static List<ContentValues> getApnContentValues(CSettings cs) {
List<ApnItem> list = cs.protoCSettings.getApns().getApnList();
- var result = new ArrayList<ContentValues>(list.size());
+ ArrayList result = new ArrayList<ContentValues>(list.size());
for (ApnItem apnItem : list) {
result.add(apnItemToContentValues(apnItem, cs.carrierId2.protoCarrierId));
@@ -185,7 +182,7 @@ public class Apns {
}
private static String typesListToString(List<ApnItem.ApnType> list) {
- var b = new StringBuilder(list.size() * 5);
+ StringBuilder b = new StringBuilder(list.size() * 5);
boolean skipComma = true;
for (ApnItem.ApnType apnType : list) {
diff --git a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
--- a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
+++ b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java
@@ -65,7 +65,7 @@ public class CarrierConfigLoader {
CSettings defaults = CSettings.get(csd, DEFAULT_CARRIER_ID);
- var bundle = new PersistableBundle();
+ PersistableBundle bundle = new PersistableBundle();
if (defaults != null) {
// settings for default carrier ID are used as a base, carrier-specific settings are
// applied on top
@@ -89,7 +89,7 @@ public class CarrierConfigLoader {
private PersistableBundle carrierConfigToBundle(CarrierConfig cc) {
List<CarrierConfig.Config> configs = cc.getConfigList();
- var bundle = new PersistableBundle(configs.size());
+ PersistableBundle bundle = new PersistableBundle(configs.size());
String TAG = "carrierConfigToBundle";
@@ -174,7 +174,7 @@ public class CarrierConfigLoader {
private void storeApnCSettingsVersion(CSettings cs) {
String k = cs.carrierId2.canonicalName;
SharedPreferences p = Prefs.get(context, Prefs.Namespace.APN_CSETTINGS_VERSIONS);
- var ed = p.edit();
+ SharedPreferences.Editor ed = p.edit();
if (p.getAll().size() > 100) {
// remove old values
ed.clear();
@@ -186,7 +186,7 @@ public class CarrierConfigLoader {
private void addVersionString(CSettings cSettings, boolean isDefault, PersistableBundle dest) {
CarrierSettings cs = cSettings.protoCSettings;
- var b = new StringBuilder();
+ StringBuilder b = new StringBuilder();
b.append(cs.getCanonicalName());
b.append('-');
b.append(cs.getVersion());
diff --git a/src/app/grapheneos/carrierconfig2/loader/Filters.java b/src/app/grapheneos/carrierconfig2/loader/Filters.java
--- a/src/app/grapheneos/carrierconfig2/loader/Filters.java
+++ b/src/app/grapheneos/carrierconfig2/loader/Filters.java
@@ -107,7 +107,7 @@ class Filters {
}
private static boolean isSystemComponentName(Context ctx, String name) {
- var cn = ComponentName.unflattenFromString(name);
+ ComponentName cn = ComponentName.unflattenFromString(name);
if (cn == null) {
Log.w(TAG, "malformed ComponentName " + name);
return false;
@@ -117,7 +117,7 @@ class Filters {
private static boolean isSystemApp(Context ctx, String packageName) {
ApplicationInfo ai;
- var pm = ctx.getPackageManager();
+ PackageManager pm = ctx.getPackageManager();
try {
ai = pm.getApplicationInfo(packageName, 0);
} catch (PackageManager.NameNotFoundException e) {

173
Patches/LineageOS-19.1/android_packages_apps_Settings/0017-CC2_Toggle.patch Normal file
View file

@ -0,0 +1,173 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Tad <tad@spotco.us>
Date: Wed, 20 Apr 2022 01:04:27 -0400
Subject: [PATCH] Add a toggle for CarrierConfig2 enablement
Copy and pasted from the GrapheneOS exec spawning toggle patch
TODO: MOVE OUT OF SECURITY CATEGORY
Change-Id: Ibea6ea9bed1c2ae3491f403d9e5c17c1d1c403f1
Signed-off-by: Tad <tad@spotco.us>
---
res/values/strings.xml | 3 +
res/xml/security_dashboard_settings.xml | 6 +
.../CarrierConfig2PreferenceController.java | 106 ++++++++++++++++++
.../settings/security/SecuritySettings.java | 1 +
4 files changed, 116 insertions(+)
create mode 100644 src/com/android/settings/security/CarrierConfig2PreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6191f0a147..1d46451503 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -13136,6 +13136,9 @@
<string name="sig_spoof_title">Unprivileged microG enablement</string>
<string name="sig_spoof_summary">Allows official builds of microG apps to function. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
+ <string name="carrierconfig2_title">Enable CarrierConfig2</string>
+ <string name="carrierconfig2_summary">Use a larger Google database instead of the AOSP database for carrier specific configurations. May improve cellular network compatibility &amp; functionality. Requires reboot.</string>
+
<!-- Title for the top level Privacy Settings [CHAR LIMIT=30]-->
<string name="privacy_dashboard_title">Privacy</string>
<!-- Summary for the top level Privacy Settings [CHAR LIMIT=NONE]-->
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index f5384fa104..0a18a8b8a7 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -87,6 +87,12 @@
android:summary="@string/sig_spoof_summary"
android:persistent="false" />
+ <SwitchPreference
+ android:key="carrierconfig2"
+ android:title="@string/carrierconfig2_title"
+ android:summary="@string/carrierconfig2_summary"
+ android:persistent="false" />
+
<com.android.settingslib.RestrictedPreference
android:key="biometric_settings"
android:title="@string/security_settings_biometric_preference_title"
diff --git a/src/com/android/settings/security/CarrierConfig2PreferenceController.java b/src/com/android/settings/security/CarrierConfig2PreferenceController.java
new file mode 100644
index 0000000000..a3e5aa1759
--- /dev/null
+++ b/src/com/android/settings/security/CarrierConfig2PreferenceController.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2022 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings.security;
+
+import android.content.Context;
+
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.os.SystemProperties;
+
+import android.provider.Settings;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceGroup;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.TwoStatePreference;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.core.PreferenceControllerMixin;
+import com.android.settingslib.core.AbstractPreferenceController;
+import com.android.settingslib.core.lifecycle.events.OnResume;
+
+public class CarrierConfig2PreferenceController extends AbstractPreferenceController
+ implements PreferenceControllerMixin, OnResume, Preference.OnPreferenceChangeListener {
+
+ private static final String SYS_KEY_CARRIERCONFIG2_ENABLE = "persist.security.carrierconfig2";
+ private static final String PREF_KEY_CARRIERCONFIG2_ENABLE = "carrierconfig2";
+ private static final String PREF_KEY_SECURITY_CATEGORY = "security_category";
+
+ private PreferenceCategory mSecurityCategory;
+ private SwitchPreference mCarrierConfig2Enable;
+ private boolean mIsAdmin;
+ private UserManager mUm;
+
+ public CarrierConfig2PreferenceController(Context context) {
+ super(context);
+ mUm = UserManager.get(context);
+ }
+
+ @Override
+ public void displayPreference(PreferenceScreen screen) {
+ super.displayPreference(screen);
+ mSecurityCategory = screen.findPreference(PREF_KEY_SECURITY_CATEGORY);
+ updatePreferenceState();
+ }
+
+ @Override
+ public boolean isAvailable() {
+ mIsAdmin = mUm.isAdminUser();
+ return mIsAdmin;
+ }
+
+ @Override
+ public String getPreferenceKey() {
+ return PREF_KEY_CARRIERCONFIG2_ENABLE;
+ }
+
+ // TODO: should we use onCreatePreferences() instead?
+ private void updatePreferenceState() {
+ if (mSecurityCategory == null) {
+ return;
+ }
+
+ if (mIsAdmin) {
+ mCarrierConfig2Enable = (SwitchPreference) mSecurityCategory.findPreference(PREF_KEY_CARRIERCONFIG2_ENABLE);
+ mCarrierConfig2Enable.setChecked(SystemProperties.getInt(SYS_KEY_CARRIERCONFIG2_ENABLE, 0) == 1);
+ } else {
+ mSecurityCategory.removePreference(mSecurityCategory.findPreference(PREF_KEY_CARRIERCONFIG2_ENABLE));
+ }
+ }
+
+ @Override
+ public void onResume() {
+ updatePreferenceState();
+ if (mCarrierConfig2Enable != null) {
+ boolean mode = mCarrierConfig2Enable.isChecked();
+ SystemProperties.set(SYS_KEY_CARRIERCONFIG2_ENABLE, mode ? "1" : "0");
+ }
+ }
+
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object value) {
+ final String key = preference.getKey();
+ if (PREF_KEY_CARRIERCONFIG2_ENABLE.equals(key)) {
+ final boolean mode = !mCarrierConfig2Enable.isChecked();
+ SystemProperties.set(SYS_KEY_CARRIERCONFIG2_ENABLE, mode ? "1" : "0");
+ }
+ return true;
+ }
+}
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index 0ac2ace282..6e0dba6668 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -127,6 +127,7 @@ public class SecuritySettings extends DashboardFragment {
securityPreferenceControllers.add(new NativeDebugPreferenceController(context));
securityPreferenceControllers.add(new HostsPreferenceController(context));
securityPreferenceControllers.add(new SigSpoofPreferenceController(context));
+ securityPreferenceControllers.add(new CarrierConfig2PreferenceController(context));
controllers.add(new PreferenceCategoryController(context, SECURITY_CATEGORY)
.setChildren(securityPreferenceControllers));
controllers.addAll(securityPreferenceControllers);

40
Patches/LineageOS-19.1/android_packages_services_Telephony/0001-CC2.patch Normal file
View file

@ -0,0 +1,40 @@
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 77c989715..6e2b12bc8 100644
--- a/src/com/android/phone/CarrierConfigLoader.java
+++ b/src/com/android/phone/CarrierConfigLoader.java
@@ -42,6 +42,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;
@@ -686,8 +687,14 @@ public class CarrierConfigLoader extends ICarrierConfigLoader.Stub {
/* package */ CarrierConfigLoader(Context context,
SubscriptionInfoUpdater subscriptionInfoUpdater, @NonNull Looper looper) {
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(looper);
IntentFilter bootFilter = new IntentFilter();

2
Patches/LineageOS-20.0/android_packages_apps_Settings/0017-OpenEUICC_Toggle.patch
View file

@ -22,7 +22,7 @@ index ce056d7ab0..751f4a4037 100644
+++ b/res/values/strings.xml
@@ -759,6 +759,9 @@
<string name="sig_spoof_title">Unprivileged microG enablement</string>
<string name="sig_spoof_summary">Allows official builds of microG apps to function. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google.</string>
<string name="sig_spoof_summary">Allows official builds of microG apps to function. Not supported, not recommended. May break apps and/or degrade their security model. Notes: 1) microG connects directly to Google, 2) apps talking to microG do so using proprietary Google libraries, 3) microG can download/execute proprietary code from Google. Requires reboot.</string>
+ <string name="openeuicc_title">Enable eUICC management</string>
+ <string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Reboot required after toggling.</string>

4
Patches/LineageOS-20.0/android_packages_apps_Settings/0018-CC2_Toggle.patch
View file

@ -17,7 +17,7 @@ Signed-off-by: Tad <tad@spotco.us>
create mode 100644 src/com/android/settings/security/CarrierConfig2PreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 751f4a4037..d8f4ed191a 100644
index 751f4a4037..3ac2ac4763 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -762,6 +762,9 @@
@ -25,7 +25,7 @@ index 751f4a4037..d8f4ed191a 100644
<string name="openeuicc_summary">Enables the OpenEUICC app to allow management of virtual (eSIM) and physical eUICC cards. Reboot required after toggling.</string>
+ <string name="carrierconfig2_title">Enable CarrierConfig2</string>
+ <string name="carrierconfig2_summary">Use a larger Google database instead of the AOSP database for carrier specific configurations. May improve cellular network compatibility &amp; functionality.</string>
+ <string name="carrierconfig2_summary">Use a larger Google database instead of the AOSP database for carrier specific configurations. May improve cellular network compatibility &amp; functionality. Requires reboot.</string>
+
<!-- Text shown for the title of the lock when trust lost option [CHAR LIMIT=40] -->
<string name="trust_lost_locks_screen_title">Lock screen when trust is lost</string>