|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Tue, 25 Jun 2024 07:48:24 -0400 |
| 4 | +Subject: [PATCH] Legacy compat |
| 5 | + |
| 6 | +Change-Id: Ic564f35a7d694cc99fc810b776bb6389efbfe3f1 |
| 7 | +Signed-off-by: Tavi < [email protected]> |
| 8 | +--- |
| 9 | + .../grapheneos/carrierconfig2/ApnServiceImpl.java | 2 +- |
| 10 | + .../carrierconfig2/CarrierServiceImpl.java | 12 +++--------- |
| 11 | + src/app/grapheneos/carrierconfig2/Utils.java | 6 +++--- |
| 12 | + src/app/grapheneos/carrierconfig2/loader/Apns.java | 9 +++------ |
| 13 | + .../carrierconfig2/loader/CarrierConfigLoader.java | 8 ++++---- |
| 14 | + .../grapheneos/carrierconfig2/loader/Filters.java | 7 ++----- |
| 15 | + 6 files changed, 16 insertions(+), 28 deletions(-) |
| 16 | + |
| 17 | +diff --git a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java |
| 18 | +index 1fc2339..1ac28fc 100644 |
| 19 | +--- a/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java |
| 20 | ++++ b/src/app/grapheneos/carrierconfig2/ApnServiceImpl.java |
| 21 | +@@ -21,7 +21,7 @@ public class ApnServiceImpl extends ApnService { |
| 22 | + public List<ContentValues> onRestoreApns(int subId) { |
| 23 | + Log.d(TAG, "onRestoreApns: subId " + subId); |
| 24 | + |
| 25 | +- var csd = CSettingsDir.getDefault(); |
| 26 | ++ CSettingsDir csd = CSettingsDir.getDefault(); |
| 27 | + if (csd == null) { |
| 28 | + Log.e(TAG, "CSettingsDir is missing"); |
| 29 | + return emptyList(); |
| 30 | +diff --git a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java |
| 31 | +index 166272f..37b430c 100644 |
| 32 | +--- a/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java |
| 33 | ++++ b/src/app/grapheneos/carrierconfig2/CarrierServiceImpl.java |
| 34 | +@@ -14,10 +14,10 @@ public class CarrierServiceImpl extends CarrierService { |
| 35 | + |
| 36 | + @Nullable |
| 37 | + @Override |
| 38 | +- public PersistableBundle onLoadConfig(int subId, @Nullable CarrierIdentifier carrierId) { |
| 39 | +- Log.d(TAG, "subId " + subId + "; carrierId " + carrierId); |
| 40 | ++ public PersistableBundle onLoadConfig(@Nullable CarrierIdentifier carrierId) { |
| 41 | ++ Log.d(TAG, "carrierId " + carrierId); |
| 42 | + |
| 43 | +- var csd = CSettingsDir.getDefault(); |
| 44 | ++ CSettingsDir csd = CSettingsDir.getDefault(); |
| 45 | + if (csd == null) { |
| 46 | + Log.e(TAG, "missing CSettingsDir"); |
| 47 | + return null; |
| 48 | +@@ -25,10 +25,4 @@ public class CarrierServiceImpl extends CarrierService { |
| 49 | + |
| 50 | + return new CarrierConfigLoader(getApplicationContext(), csd).load(carrierId); |
| 51 | + } |
| 52 | +- |
| 53 | +- @Override |
| 54 | +- public PersistableBundle onLoadConfig(CarrierIdentifier id) { |
| 55 | +- // this method is deprecated and should never be called by the OS |
| 56 | +- throw new IllegalStateException(String.valueOf(id)); |
| 57 | +- } |
| 58 | + } |
| 59 | +diff --git a/src/app/grapheneos/carrierconfig2/Utils.java b/src/app/grapheneos/carrierconfig2/Utils.java |
| 60 | +index 7300925..06abf09 100644 |
| 61 | +--- a/src/app/grapheneos/carrierconfig2/Utils.java |
| 62 | ++++ b/src/app/grapheneos/carrierconfig2/Utils.java |
| 63 | +@@ -22,7 +22,7 @@ public class Utils { |
| 64 | + return null; |
| 65 | + } |
| 66 | + |
| 67 | +- var tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId); |
| 68 | ++ TelephonyManager tm = ctx.getSystemService(TelephonyManager.class).createForSubscriptionId(subId); |
| 69 | + String simOperator = tm.getSimOperator(); |
| 70 | + |
| 71 | + if (simOperator == null) { |
| 72 | +@@ -46,13 +46,13 @@ public class Utils { |
| 73 | + String imsi = tm.getSubscriberId(); |
| 74 | + String gid1 = tm.getGroupIdLevel1(); |
| 75 | + |
| 76 | +- var res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null); |
| 77 | ++ CarrierIdentifier res = new CarrierIdentifier(mcc, mnc, spn, imsi, gid1, null); |
| 78 | + Log.d(TAG, "subId " + subId + "; " + res); |
| 79 | + return res; |
| 80 | + } |
| 81 | + |
| 82 | + public static String printStackTraceToString(Throwable t) { |
| 83 | +- var baos = new ByteArrayOutputStream(1000); |
| 84 | ++ ByteArrayOutputStream baos = new ByteArrayOutputStream(1000); |
| 85 | + t.printStackTrace(new PrintStream(baos)); |
| 86 | + return baos.toString(); |
| 87 | + } |
| 88 | +diff --git a/src/app/grapheneos/carrierconfig2/loader/Apns.java b/src/app/grapheneos/carrierconfig2/loader/Apns.java |
| 89 | +index ff0082f..357e6ea 100644 |
| 90 | +--- a/src/app/grapheneos/carrierconfig2/loader/Apns.java |
| 91 | ++++ b/src/app/grapheneos/carrierconfig2/loader/Apns.java |
| 92 | +@@ -39,7 +39,7 @@ public class Apns { |
| 93 | + } |
| 94 | + |
| 95 | + private static ContentValues apnItemToContentValues(ApnItem i, CarrierId protoCarrierId) { |
| 96 | +- var cv = new ContentValues(); |
| 97 | ++ ContentValues cv = new ContentValues(); |
| 98 | + cv.put(Telephony.Carriers.APN, i.getValue()); |
| 99 | + cv.put(Telephony.Carriers.NAME, i.getName()); |
| 100 | + |
| 101 | +@@ -114,9 +114,6 @@ public class Apns { |
| 102 | + |
| 103 | + int lntBitmask = i.hasLingeringNetworkTypeBitmask() ? |
| 104 | + parseBitmaskString(i.getLingeringNetworkTypeBitmask()) : 0; |
| 105 | +- cv.put(Telephony.Carriers.LINGERING_NETWORK_TYPE_BITMASK, lntBitmask); |
| 106 | +- cv.put(Telephony.Carriers.ALWAYS_ON, i.getAlwaysOn()); |
| 107 | +- cv.put(Telephony.Carriers.MTU_V6, i.getMtuV6()); |
| 108 | + |
| 109 | + return cv; |
| 110 | + } |
| 111 | +@@ -164,7 +161,7 @@ public class Apns { |
| 112 | + private static List<ContentValues> getApnContentValues(CSettings cs) { |
| 113 | + List<ApnItem> list = cs.protoCSettings.getApns().getApnList(); |
| 114 | + |
| 115 | +- var result = new ArrayList<ContentValues>(list.size()); |
| 116 | ++ ArrayList result = new ArrayList<ContentValues>(list.size()); |
| 117 | + |
| 118 | + for (ApnItem apnItem : list) { |
| 119 | + result.add(apnItemToContentValues(apnItem, cs.carrierId2.protoCarrierId)); |
| 120 | +@@ -185,7 +182,7 @@ public class Apns { |
| 121 | + } |
| 122 | + |
| 123 | + private static String typesListToString(List<ApnItem.ApnType> list) { |
| 124 | +- var b = new StringBuilder(list.size() * 5); |
| 125 | ++ StringBuilder b = new StringBuilder(list.size() * 5); |
| 126 | + boolean skipComma = true; |
| 127 | + |
| 128 | + for (ApnItem.ApnType apnType : list) { |
| 129 | +diff --git a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java |
| 130 | +index 1d77aac..97a07be 100644 |
| 131 | +--- a/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java |
| 132 | ++++ b/src/app/grapheneos/carrierconfig2/loader/CarrierConfigLoader.java |
| 133 | +@@ -65,7 +65,7 @@ public class CarrierConfigLoader { |
| 134 | + |
| 135 | + CSettings defaults = CSettings.get(csd, DEFAULT_CARRIER_ID); |
| 136 | + |
| 137 | +- var bundle = new PersistableBundle(); |
| 138 | ++ PersistableBundle bundle = new PersistableBundle(); |
| 139 | + if (defaults != null) { |
| 140 | + // settings for default carrier ID are used as a base, carrier-specific settings are |
| 141 | + // applied on top |
| 142 | +@@ -89,7 +89,7 @@ public class CarrierConfigLoader { |
| 143 | + |
| 144 | + private PersistableBundle carrierConfigToBundle(CarrierConfig cc) { |
| 145 | + List<CarrierConfig.Config> configs = cc.getConfigList(); |
| 146 | +- var bundle = new PersistableBundle(configs.size()); |
| 147 | ++ PersistableBundle bundle = new PersistableBundle(configs.size()); |
| 148 | + |
| 149 | + String TAG = "carrierConfigToBundle"; |
| 150 | + |
| 151 | +@@ -174,7 +174,7 @@ public class CarrierConfigLoader { |
| 152 | + private void storeApnCSettingsVersion(CSettings cs) { |
| 153 | + String k = cs.carrierId2.canonicalName; |
| 154 | + SharedPreferences p = Prefs.get(context, Prefs.Namespace.APN_CSETTINGS_VERSIONS); |
| 155 | +- var ed = p.edit(); |
| 156 | ++ SharedPreferences.Editor ed = p.edit(); |
| 157 | + if (p.getAll().size() > 100) { |
| 158 | + // remove old values |
| 159 | + ed.clear(); |
| 160 | +@@ -186,7 +186,7 @@ public class CarrierConfigLoader { |
| 161 | + private void addVersionString(CSettings cSettings, boolean isDefault, PersistableBundle dest) { |
| 162 | + CarrierSettings cs = cSettings.protoCSettings; |
| 163 | + |
| 164 | +- var b = new StringBuilder(); |
| 165 | ++ StringBuilder b = new StringBuilder(); |
| 166 | + b.append(cs.getCanonicalName()); |
| 167 | + b.append('-'); |
| 168 | + b.append(cs.getVersion()); |
| 169 | +diff --git a/src/app/grapheneos/carrierconfig2/loader/Filters.java b/src/app/grapheneos/carrierconfig2/loader/Filters.java |
| 170 | +index 75764db..02b92a9 100644 |
| 171 | +--- a/src/app/grapheneos/carrierconfig2/loader/Filters.java |
| 172 | ++++ b/src/app/grapheneos/carrierconfig2/loader/Filters.java |
| 173 | +@@ -23,12 +23,10 @@ class Filters { |
| 174 | + case CarrierConfigManager.KEY_EDITABLE_ENHANCED_4G_LTE_BOOL: |
| 175 | + case CarrierConfigManager.KEY_EDITABLE_WFC_MODE_BOOL: |
| 176 | + case CarrierConfigManager.KEY_EDITABLE_WFC_ROAMING_MODE_BOOL: |
| 177 | +- case CarrierConfigManager.KEY_HIDE_ENABLE_2G: |
| 178 | + case CarrierConfigManager.KEY_HIDE_ENHANCED_4G_LTE_BOOL: |
| 179 | + case CarrierConfigManager.KEY_HIDE_IMS_APN_BOOL: |
| 180 | + case CarrierConfigManager.KEY_HIDE_PRESET_APN_DETAILS_BOOL: |
| 181 | + case CarrierConfigManager.KEY_SHOW_APN_SETTING_CDMA_BOOL: |
| 182 | +- case CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL: |
| 183 | + case "com.google.android.dialer.display_wifi_calling_button_bool": |
| 184 | + return null; |
| 185 | + } |
| 186 | +@@ -52,7 +50,6 @@ class Filters { |
| 187 | + return null; |
| 188 | + } |
| 189 | + break; |
| 190 | +- case CarrierConfigManager.KEY_CARRIER_PROVISIONING_APP_STRING: |
| 191 | + case CarrierConfigManager.KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING: |
| 192 | + case CarrierConfigManager.KEY_CARRIER_SETUP_APP_STRING: |
| 193 | + case CarrierConfigManager.KEY_SMART_FORWARDING_CONFIG_COMPONENT_NAME_STRING: |
| 194 | +@@ -107,7 +104,7 @@ class Filters { |
| 195 | + } |
| 196 | + |
| 197 | + private static boolean isSystemComponentName(Context ctx, String name) { |
| 198 | +- var cn = ComponentName.unflattenFromString(name); |
| 199 | ++ ComponentName cn = ComponentName.unflattenFromString(name); |
| 200 | + if (cn == null) { |
| 201 | + Log.w(TAG, "malformed ComponentName " + name); |
| 202 | + return false; |
| 203 | +@@ -117,7 +114,7 @@ class Filters { |
| 204 | + |
| 205 | + private static boolean isSystemApp(Context ctx, String packageName) { |
| 206 | + ApplicationInfo ai; |
| 207 | +- var pm = ctx.getPackageManager(); |
| 208 | ++ PackageManager pm = ctx.getPackageManager(); |
| 209 | + try { |
| 210 | + ai = pm.getApplicationInfo(packageName, 0); |
| 211 | + } catch (PackageManager.NameNotFoundException e) { |
0 commit comments