mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-01 17:11:41 +00:00
9a6c3f99ed
- No patches were found with incorrect authorship/From: lines - The older AndroidHardening patch repos are no longer available to verify CID. - New GrapheneOS patches do not include a CID. - *Signature_Spoofing.patch CID could not be found. - Fixed CID of *Harden_Sig_Spoofing.patch to match 14.1 - Fixed CID of *LGE_Fixes.patch to match 14.1 - Fixed CID of *Harden.patch to match 14.1 - Added edit note to *Harden.patch - Fixed CID of *PREREQ_Handle_All_Modes.patch to match 14.1 - Fixed CID of *More_Preferred_Network_Modes.patch to match 14.1 - Fixed CID of *AES256.patch to match 14.1 - Fixed CID of *0001-OTA_Keys.patch to match 18.1 - Fixed CID of *Camera_Fix.patch to match 15.1 - Fixed CID of *Connectivity.patch to match 14.1 - Fixed CID of *Fix_Calling.patch to match 14.1 - Fixed CID of *Remove_Analytics.patch to match 14.1 - Fixed CID of Unused-*.patch/audio_extn to match original Signed-off-by: Tad <tad@spotco.us>
139 lines
7.1 KiB
Diff
139 lines
7.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tad <tad@spotco.us>
|
|
Date: Fri, 28 Dec 2018 21:18:47 -0500
|
|
Subject: [PATCH] Change UpdateEnabledNetworksValueAndSummary to handle all
|
|
modes
|
|
|
|
Change-Id: I25bab65a6b3743a05f2d76395e59dc3f241a14d3
|
|
---
|
|
.../android/phone/MobileNetworkSettings.java | 50 ++++---------------
|
|
1 file changed, 11 insertions(+), 39 deletions(-)
|
|
|
|
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
|
|
index 0ea4702b4..4bf0f9e9a 100644
|
|
--- a/src/com/android/phone/MobileNetworkSettings.java
|
|
+++ b/src/com/android/phone/MobileNetworkSettings.java
|
|
@@ -1423,35 +1423,31 @@ public class MobileNetworkSettings extends Activity {
|
|
}
|
|
|
|
private void UpdateEnabledNetworksValueAndSummary(int NetworkMode) {
|
|
+ boolean invalidMode = false;
|
|
switch (NetworkMode) {
|
|
case Phone.NT_MODE_TDSCDMA_WCDMA:
|
|
case Phone.NT_MODE_TDSCDMA_GSM_WCDMA:
|
|
case Phone.NT_MODE_TDSCDMA_GSM:
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_TDSCDMA_GSM_WCDMA));
|
|
+ case Phone.NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
|
|
+ case Phone.NT_MODE_CDMA:
|
|
+ case Phone.NT_MODE_EVDO_NO_CDMA:
|
|
+ case Phone.NT_MODE_GLOBAL:
|
|
+ case Phone.NT_MODE_TDSCDMA_ONLY:
|
|
mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
|
break;
|
|
case Phone.NT_MODE_WCDMA_ONLY:
|
|
case Phone.NT_MODE_GSM_UMTS:
|
|
case Phone.NT_MODE_WCDMA_PREF:
|
|
if (!mIsGlobalCdma) {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_WCDMA_PREF));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
|
} else {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_global);
|
|
}
|
|
break;
|
|
case Phone.NT_MODE_GSM_ONLY:
|
|
if (!mIsGlobalCdma) {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_GSM_ONLY));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_2G);
|
|
} else {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_global);
|
|
}
|
|
break;
|
|
@@ -1466,13 +1462,9 @@ public class MobileNetworkSettings extends Activity {
|
|
case Phone.NT_MODE_LTE_ONLY:
|
|
case Phone.NT_MODE_LTE_WCDMA:
|
|
if (!mIsGlobalCdma) {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_GSM_WCDMA));
|
|
mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)
|
|
? R.string.network_4G : R.string.network_lte);
|
|
} else {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_global);
|
|
}
|
|
break;
|
|
@@ -1483,33 +1475,12 @@ public class MobileNetworkSettings extends Activity {
|
|
controlCdmaOptions(true);
|
|
controlGsmOptions(false);
|
|
} else {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_CDMA_AND_EVDO));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_lte);
|
|
}
|
|
break;
|
|
- case Phone.NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
|
|
- mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
|
- break;
|
|
- case Phone.NT_MODE_CDMA:
|
|
- case Phone.NT_MODE_EVDO_NO_CDMA:
|
|
- case Phone.NT_MODE_GLOBAL:
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_CDMA));
|
|
- mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
|
- break;
|
|
case Phone.NT_MODE_CDMA_NO_EVDO:
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_CDMA_NO_EVDO));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_1x);
|
|
break;
|
|
- case Phone.NT_MODE_TDSCDMA_ONLY:
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_TDSCDMA_ONLY));
|
|
- mButtonEnabledNetworks.setSummary(R.string.network_3G);
|
|
- break;
|
|
case Phone.NT_MODE_LTE_TDSCDMA_GSM:
|
|
case Phone.NT_MODE_LTE_TDSCDMA_GSM_WCDMA:
|
|
case Phone.NT_MODE_LTE_TDSCDMA:
|
|
@@ -1517,16 +1488,12 @@ public class MobileNetworkSettings extends Activity {
|
|
case Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
|
|
case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
|
|
if (isSupportTdscdma()) {
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
|
|
mButtonEnabledNetworks.setSummary(R.string.network_lte);
|
|
} else {
|
|
if (isWorldMode()) {
|
|
controlCdmaOptions(true);
|
|
controlGsmOptions(false);
|
|
}
|
|
- mButtonEnabledNetworks.setValue(
|
|
- Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
|
|
if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
|
|
mIsGlobalCdma ||
|
|
isWorldMode()) {
|
|
@@ -1538,10 +1505,15 @@ public class MobileNetworkSettings extends Activity {
|
|
}
|
|
break;
|
|
default:
|
|
+ invalidMode = true;
|
|
String errMsg = "Invalid Network Mode (" + NetworkMode + "). Ignore.";
|
|
loge(errMsg);
|
|
mButtonEnabledNetworks.setSummary(errMsg);
|
|
}
|
|
+ if (!invalidMode) {
|
|
+ mButtonEnabledNetworks.setValue(
|
|
+ Integer.toString(NetworkMode));
|
|
+ }
|
|
}
|
|
|
|
@Override
|