Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

21.0: More work

Browse Source 
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-05-20 18:26:50 -04:00
parent 07951955d3
commit 23a2127669
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
14 changed files with 112 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Manifests/Manifest_LAOS-21.0.xml
View File

@ -62,35 +62,27 @@
<project path="hardware/sony/timekeep" remote="github" name="LineageOS/android_hardware_sony_timekeep" revision="lineage-21" />
<project path="packages/apps/ElmyraService" name="LineageOS/android_packages_apps_ElmyraService" remote="github" />
<!-- Google Tensor Commons -->
<project path="device/google/gs-common" name="LineageOS/android_device_google_gs-common" remote="github" revision="lineage-21" />
<project path="device/google/gs101" name="LineageOS/android_device_google_gs101" remote="github" revision="lineage-21" />
<project path="device/google/gs201" name="LineageOS/android_device_google_gs201" remote="github" revision="lineage-21" />
<!-- Google Pixel 6 (oriole/raven) -->
<project path="device/google/raviole" name="LineageOS/android_device_google_raviole" remote="github" revision="lineage-21" />
<project path="device/google/oriole" name="LineageOS/android_device_google_oriole" remote="github" revision="lineage-21" />
<project path="device/google/raven" name="LineageOS/android_device_google_raven" remote="github" revision="lineage-21" />
<project path="device/google/raviole" name="LineageOS/android_device_google_raviole" remote="github" revision="lineage-21" />
<project path="device/google/gs101" name="LineageOS/android_device_google_gs101" remote="github" revision="lineage-21" />
<!-- Google Pixel 6a (bluejay) -->
<project path="device/google/bluejay" name="LineageOS/android_device_google_bluejay" remote="github" revision="lineage-21" />
<!-- uses gs101 commons -->
<project path="device/google/bluejay-kernel" name="device/google/bluejay-kernel" remote="aosp-bluejay" clone-depth="1" />
<!-- Google Pixel 7 (panther/cheetah) -->
<project path="device/google/pantah" name="LineageOS/android_device_google_pantah" remote="github" revision="lineage-21" />
<project path="device/google/panther" name="LineageOS/android_device_google_panther" remote="github" revision="lineage-21" />
<project path="device/google/cheetah" name="LineageOS/android_device_google_cheetah" remote="github" revision="lineage-21" />
<project path="device/google/pantah" name="LineageOS/android_device_google_pantah" remote="github" revision="lineage-21" />
<project path="device/google/gs201" name="LineageOS/android_device_google_gs201" remote="github" revision="lineage-21" />
<project path="kernel/google/gs201/private/gs-google" name="LineageOS/android_kernel_google_gs201" remote="github" revision="lineage-21" />
<!-- uses gs101 commons -->
<!-- Google Pixel 7a (lynx) -->
<project path="device/google/lynx" name="LineageOS/android_device_google_lynx" remote="github" revision="lineage-21" />
<!-- uses gs101 commons -->
<!-- Google Pixel Tablet (tangorpro) -->
<project path="device/google/tangorpro" name="LineageOS/android_device_google_tangorpro" remote="github" revision="lineage-21" />
<!-- uses gs101 commons -->
<!-- Google Pixel Fold (felix) -->
<project path="device/google/felix" name="LineageOS/android_device_google_felix" remote="github" revision="lineage-21" />
<!-- uses gs101 commons -->
<!-- Proprietary Blobs -->
<project path="vendor/google/bluejay" name="[COLOUR IN THE LINES]/proprietary_vendor_google_bluejay" remote="github" revision="lineage-21" />

4
Patches/LineageOS-21.0/android_frameworks_base/0040-euicc-restrictions.patch
View File

@ -14,10 +14,10 @@ Change-Id: I49e3ff6f2ce8d74383da1c4dfd42913c713016c6
2 files changed, 37 insertions(+)
diff --git a/data/etc/preinstalled-packages-platform.xml b/data/etc/preinstalled-packages-platform.xml
index ff8d96dd23f2..97027ebbca2d 100644
index 421bc25d60e9..7e46319dca38 100644
--- a/data/etc/preinstalled-packages-platform.xml
+++ b/data/etc/preinstalled-packages-platform.xml
@@ -110,4 +110,10 @@ to pre-existing users, but cannot uninstall pre-existing system packages from pr
@@ -128,4 +128,10 @@ to pre-existing users, but cannot uninstall pre-existing system packages from pr
<install-in-user-type package="com.android.wallpaperbackup">
<install-in user-type="FULL" />
</install-in-user-type>

22
Patches/LineageOS-21.0/android_frameworks_base/0041-tile_restrictions.patch
View File

@ -1,4 +1,4 @@
From e289ce2b276805111724881c242eb0eba058caa1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Mon, 11 Mar 2024 19:40:18 +0200
Subject: [PATCH] SystemUI: require unlocking to use QS tiles by default
@ -11,10 +11,10 @@ Subject: [PATCH] SystemUI: require unlocking to use QS tiles by default
4 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSHost.java
index 1ab64b76b0dc..69fb741550bd 100644
index 919b99604fd5..3b73cb8bf7a3 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSHost.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSHost.java
@@ -55,6 +55,7 @@ static List<String> getDefaultSpecs(Resources res) {
@@ -55,6 +55,7 @@ public interface QSHost {
Context getUserContext();
int getUserId();
Collection<QSTile> getTiles();
@ -36,10 +36,10 @@ index c77233eb1737..32c6ffd86a64 100644
return if (useNewHost) {
interactor.currentTilesSpecs.map { it.spec }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java
index 828d6ed6ab89..0038fe7da7f4 100644
index cc370ff50c52..6cbef8241a48 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTileHost.java
@@ -53,6 +53,7 @@
@@ -53,6 +53,7 @@ import com.android.systemui.settings.UserFileManager;
import com.android.systemui.settings.UserTracker;
import com.android.systemui.shade.ShadeController;
import com.android.systemui.statusbar.phone.AutoTileManager;
@ -55,7 +55,7 @@ index 828d6ed6ab89..0038fe7da7f4 100644
private final LinkedHashMap<String, QSTile> mTiles = new LinkedHashMap<>();
private final ArrayList<String> mTileSpecs = new ArrayList<>();
private final TunerService mTunerService;
@@ -127,6 +129,7 @@ public QSTileHost(Context context,
@@ -127,6 +129,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P
Lazy<NewQSTileFactory> newQsTileFactoryProvider,
QSFactory defaultFactory,
@Main Executor mainExecutor,
@ -63,7 +63,7 @@ index 828d6ed6ab89..0038fe7da7f4 100644
PluginManager pluginManager,
TunerService tunerService,
Provider<AutoTileManager> autoTiles,
@@ -140,6 +143,7 @@ public QSTileHost(Context context,
@@ -140,6 +143,7 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P
QSPipelineFlagsRepository featureFlags
) {
mContext = context;
@ -71,7 +71,7 @@ index 828d6ed6ab89..0038fe7da7f4 100644
mUserContext = context;
mTunerService = tunerService;
mPluginManager = pluginManager;
@@ -209,6 +213,11 @@ public void removeCallback(Callback callback) {
@@ -209,6 +213,11 @@ public class QSTileHost implements QSHost, Tunable, PluginListener<QSFactory>, P
mCallbacks.remove(callback);
}
@ -87,7 +87,7 @@ diff --git a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.j
index 529d68407ce9..5cb51840bb52 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSTileImpl.java
@@ -68,6 +68,7 @@
@@ -68,6 +68,7 @@ import com.android.systemui.qs.QSHost;
import com.android.systemui.qs.QsEventLogger;
import com.android.systemui.qs.SideLabelTileLayout;
import com.android.systemui.qs.logging.QSLogger;
@ -95,7 +95,7 @@ index 529d68407ce9..5cb51840bb52 100644
import java.io.PrintWriter;
import java.util.ArrayList;
@@ -269,6 +270,32 @@ public boolean isAvailable() {
@@ -269,6 +270,32 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
return true;
}
@ -128,7 +128,7 @@ index 529d68407ce9..5cb51840bb52 100644
// safe to call from any thread
public void addCallback(Callback callback) {
@@ -592,16 +619,19 @@ public void handleMessage(Message msg) {
@@ -592,16 +619,19 @@ public abstract class QSTileImpl<TState extends State> implements QSTile, Lifecy
mActivityStarter.postStartActivityDismissingKeyguard(intent, 0);
} else {
mQSLogger.logHandleClick(mTileSpec, msg.arg1);

4
Patches/LineageOS-21.0/android_frameworks_base/0042-minimal_screenshot_exif.patch
View File

@ -12,10 +12,10 @@ Change-Id: I6f38c5cf04539e09b8bfe0102c646bd8faa50f5b
1 file changed, 11 deletions(-)
diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
index 898f58d342d6..d8602685758c 100644
index 0c73a81e542e..f52f37764bc6 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java
@@ -404,19 +404,8 @@ public class ImageExporter {
@@ -411,19 +411,8 @@ public class ImageExporter {
static void updateExifAttributes(ExifInterface exif, UUID uniqueId, int width, int height,
ZonedDateTime captureTime) {

10
Patches/LineageOS-21.0/android_hardware_qcom_audio/0001-Unused-sm8150.patch
View File

@ -21,10 +21,10 @@ Change-Id: I694c683c9bfde60343f0f6ea8d806bc5e24437e6
2 files changed, 6 insertions(+)
diff --git a/hal/audio_extn/audio_extn.h b/hal/audio_extn/audio_extn.h
index 175715f1e3..b70e24f7e3 100644
index da986ad63b..82320356e0 100644
--- a/hal/audio_extn/audio_extn.h
+++ b/hal/audio_extn/audio_extn.h
@@ -873,7 +873,11 @@ bool audio_extn_utils_is_dolby_format(audio_format_t format);
@@ -834,7 +834,11 @@ bool audio_extn_utils_is_dolby_format(audio_format_t format);
int audio_extn_utils_get_bit_width_from_string(const char *);
int audio_extn_utils_get_sample_rate_from_string(const char *);
int audio_extn_utils_get_channels_from_string(const char *);
@ -37,10 +37,10 @@ index 175715f1e3..b70e24f7e3 100644
int audio_extn_utils_get_vendor_enhanced_info();
int audio_extn_utils_get_app_sample_rate_for_device(struct audio_device *adev,
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index be20e12953..981cad8e1e 100644
index 0ba2f4f829..d179f4f030 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -3315,6 +3315,7 @@ int audio_extn_utils_get_channels_from_string(const char *id_string)
@@ -3072,6 +3072,7 @@ int audio_extn_utils_get_channels_from_string(const char *id_string)
return -EINVAL;
}
@ -48,7 +48,7 @@ index be20e12953..981cad8e1e 100644
void audio_extn_utils_release_snd_device(snd_device_t snd_device)
{
audio_extn_dev_arbi_release(snd_device);
@@ -3323,6 +3324,7 @@ void audio_extn_utils_release_snd_device(snd_device_t snd_device)
@@ -3080,6 +3081,7 @@ void audio_extn_utils_release_snd_device(snd_device_t snd_device)
audio_extn_listen_update_device_status(snd_device,
LISTEN_EVENT_SND_DEVICE_FREE);
}

10
Patches/LineageOS-21.0/android_packages_apps_Settings/0010-exec_spawning_toggle.patch
View File

@ -12,10 +12,10 @@ Subject: [PATCH] add exec spawning toggle
create mode 100644 src/com/android/settings/security/ExecSpawnPreferenceController.java
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 553d210a17..e090ad8a05 100644
index 8ad86f32445..2905e96d006 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -747,6 +747,9 @@
@@ -668,6 +668,9 @@
<string name="auto_reboot_title">Auto reboot</string>
<string name="auto_reboot_summary">Automatically reboot the device, if the phone hasn\'t been unlocked within the selected number of hours.</string>
@ -26,7 +26,7 @@ index 553d210a17..e090ad8a05 100644
<string name="native_debug_summary">Generate useful logs / bug reports from crashes and permit debugging native code.</string>
diff --git a/res/xml/security_dashboard_settings.xml b/res/xml/security_dashboard_settings.xml
index 61e2db495a..3a06288497 100644
index 61e2db495a0..3a062884976 100644
--- a/res/xml/security_dashboard_settings.xml
+++ b/res/xml/security_dashboard_settings.xml
@@ -69,6 +69,12 @@
@ -44,7 +44,7 @@ index 61e2db495a..3a06288497 100644
android:title="@string/native_debug_title"
diff --git a/src/com/android/settings/security/ExecSpawnPreferenceController.java b/src/com/android/settings/security/ExecSpawnPreferenceController.java
new file mode 100644
index 0000000000..98cc3c29e1
index 00000000000..98cc3c29e12
--- /dev/null
+++ b/src/com/android/settings/security/ExecSpawnPreferenceController.java
@@ -0,0 +1,106 @@
@ -155,7 +155,7 @@ index 0000000000..98cc3c29e1
+ }
+}
diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java
index ecf8f02e9d..e48164ae62 100644
index d29325d0fbc..4c6e1c99815 100644
--- a/src/com/android/settings/security/SecuritySettings.java
+++ b/src/com/android/settings/security/SecuritySettings.java
@@ -106,6 +106,7 @@ public class SecuritySettings extends DashboardFragment {

16
Patches/LineageOS-21.0/android_packages_apps_Settings/0011-Random_MAC.patch
View File

@ -1,4 +1,4 @@
From 6510b84f39264c63deb1c89ee72798da611acdd1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: renlord <me@renlord.com>
Date: Fri, 15 Oct 2021 20:02:51 +0530
Subject: [PATCH] add option to always randomize MAC
@ -26,10 +26,10 @@ index 77afedc3042..075b751e710 100644
<LinearLayout
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f84afec09fc..1ca428bc8c3 100644
index 085a33bc53f..b3511593319 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1053,6 +1053,12 @@
@@ -1172,6 +1172,12 @@
<item>Treat as unmetered</item>
</string-array>
@ -42,7 +42,7 @@ index f84afec09fc..1ca428bc8c3 100644
<string-array name="wifi_privacy_entries">
<item>Use randomized MAC (default)</item>
<item>Use device MAC</item>
@@ -1070,6 +1076,7 @@
@@ -1189,6 +1195,7 @@
</string-array>
<string-array name="wifi_privacy_values" translatable="false">
@ -67,7 +67,7 @@ diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceControll
index b67c84832fb..e0c9ba89ab7 100644
--- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
+++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
@@ -747,7 +747,7 @@ private void refreshWifiType() {
@@ -747,7 +747,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle
}
private int getMacAddressTitle() {
@ -99,7 +99,7 @@ index 8c78e805d69..4ec97ba5f42 100644
public WifiPrivacyPreferenceController2(Context context) {
super(context, KEY_WIFI_PRIVACY);
@@ -93,8 +98,6 @@ int getRandomizationValue() {
@@ -93,8 +98,6 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
return mWifiEntry.getPrivacy();
}
@ -108,7 +108,7 @@ index 8c78e805d69..4ec97ba5f42 100644
/**
* Returns preference index value.
@@ -103,8 +106,14 @@ int getRandomizationValue() {
@@ -103,8 +106,14 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
* @return index value of preference
*/
public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
@ -125,7 +125,7 @@ index 8c78e805d69..4ec97ba5f42 100644
}
/**
@@ -114,8 +123,14 @@ public static int translateMacRandomizedValueToPrefValue(int macRandomized) {
@@ -114,8 +123,14 @@ public class WifiPrivacyPreferenceController2 extends BasePreferenceController i
* @return mac randomized value
*/
public static int translatePrefValueToMacRandomizedValue(int prefMacRandomized) {

26
Patches/LineageOS-21.0/android_packages_apps_Settings/0014-LTE_Only_Mode.patch
View File

@ -1,4 +1,4 @@
From a701093b129688269e41b2ab7d2706344225e94e Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pratyush <codelab@pratyush.dev>
Date: Fri, 19 Aug 2022 11:05:36 +0530
Subject: [PATCH] LTE Only Mode
@ -14,10 +14,10 @@ Co-authored-by: flawedworld <flawedworld@flawed.world>
3 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 716302483e0..5acbef2c09a 100644
index 04722ef295b..980ecbdbd9a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11065,6 +11065,8 @@
@@ -11097,6 +11097,8 @@
<string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: CDMA/EvDo/GSM/WCDMA</string>
<!-- LTE [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_summary">Preferred network mode: LTE </string>
@ -26,7 +26,7 @@ index 716302483e0..5acbef2c09a 100644
<!-- GSM/WCDMA/LTE [CHAR LIMIT=NONE] -->
<string name="preferred_network_mode_lte_gsm_wcdma_summary">Preferred network mode: GSM/WCDMA/LTE</string>
<!-- CDMA+LTE/EVDO [CHAR LIMIT=NONE] -->
@@ -11130,8 +11132,12 @@
@@ -11162,8 +11164,12 @@
<string name="network_4G_pure" translatable="false">4G</string>
<!-- Text for Network lte [CHAR LIMIT=NONE] -->
<string name="network_lte">LTE (recommended)</string>
@ -43,7 +43,7 @@ diff --git a/src/com/android/settings/network/telephony/EnabledNetworkModePrefer
index 2a355adaae4..03d5f20f16f 100644
--- a/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/EnabledNetworkModePreferenceController.java
@@ -95,7 +95,7 @@ public int getAvailabilityStatus(int subId) {
@@ -95,7 +95,7 @@ public class EnabledNetworkModePreferenceController extends
CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)
|| carrierConfig.getBoolean(
CarrierConfigManager.KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL)) {
@ -52,7 +52,7 @@ index 2a355adaae4..03d5f20f16f 100644
} else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {
visible = false;
} else if (!isCallStateIdle()) {
@@ -290,6 +290,7 @@ public void updateConfig() {
@@ -290,6 +290,7 @@ public class EnabledNetworkModePreferenceController extends
}
void setPreferenceEntries() {
@ -60,7 +60,7 @@ index 2a355adaae4..03d5f20f16f 100644
mTelephonyManager = mTelephonyManager.createForSubscriptionId(mSubId);
clearAllEntries();
@@ -305,6 +306,7 @@ void setPreferenceEntries() {
@@ -305,6 +306,7 @@ public class EnabledNetworkModePreferenceController extends
.addFormat(UiOptions.PresentFormat.addGlobalEntry);
break;
case ENABLED_NETWORKS_CDMA_NO_LTE_CHOICES:
@ -68,7 +68,7 @@ index 2a355adaae4..03d5f20f16f 100644
uiOptions = uiOptions
.setChoices(R.array.enabled_networks_cdma_no_lte_values)
.addFormat(UiOptions.PresentFormat.add3gEntry)
@@ -324,6 +326,7 @@ void setPreferenceEntries() {
@@ -324,6 +326,7 @@ public class EnabledNetworkModePreferenceController extends
.addFormat(UiOptions.PresentFormat.add2gEntry);
break;
case ENABLED_NETWORKS_EXCEPT_GSM_LTE_CHOICES:
@ -76,7 +76,7 @@ index 2a355adaae4..03d5f20f16f 100644
uiOptions = uiOptions
.setChoices(R.array.enabled_networks_except_gsm_lte_values)
.addFormat(UiOptions.PresentFormat.add3gEntry);
@@ -341,6 +344,7 @@ void setPreferenceEntries() {
@@ -341,6 +344,7 @@ public class EnabledNetworkModePreferenceController extends
.addFormat(UiOptions.PresentFormat.add3gEntry);
break;
case ENABLED_NETWORKS_EXCEPT_LTE_CHOICES:
@ -84,7 +84,7 @@ index 2a355adaae4..03d5f20f16f 100644
uiOptions = uiOptions
.setChoices(R.array.enabled_networks_except_lte_values)
.addFormat(UiOptions.PresentFormat.add3gEntry)
@@ -389,6 +393,11 @@ void setPreferenceEntries() {
@@ -389,6 +393,11 @@ public class EnabledNetworkModePreferenceController extends
throw new IllegalArgumentException(
uiOptions.getType().name() + " index error.");
}
@ -96,7 +96,7 @@ index 2a355adaae4..03d5f20f16f 100644
// Compose options based on given values and formats.
IntStream.range(0, formatList.size()).forEach(entryIndex -> {
switch (formatList.get(entryIndex)) {
@@ -575,6 +584,9 @@ void setPreferenceValueAndSummary(int networkMode) {
@@ -575,6 +584,9 @@ public class EnabledNetworkModePreferenceController extends
break;
}
case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:
@ -106,7 +106,7 @@ index 2a355adaae4..03d5f20f16f 100644
case TelephonyManagerConstants.NETWORK_MODE_LTE_WCDMA:
if (!mIsGlobalCdma) {
setSelectedEntry(
@@ -840,6 +852,16 @@ private void add1xEntry(int value) {
@@ -840,6 +852,16 @@ public class EnabledNetworkModePreferenceController extends
mEntriesValue.add(value);
}
@ -127,7 +127,7 @@ diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePref
index bdfeace1be6..535645a8647 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -137,7 +137,7 @@ private int getPreferredNetworkModeSummaryResId(int NetworkMode) {
@@ -137,7 +137,7 @@ public class PreferredNetworkModePreferenceController extends TelephonyBasePrefe
case TelephonyManagerConstants.NETWORK_MODE_LTE_TDSCDMA:
return R.string.preferred_network_mode_lte_tdscdma_summary;
case TelephonyManagerConstants.NETWORK_MODE_LTE_ONLY:

14
Patches/LineageOS-21.0/android_packages_apps_Settings/0018-disable_apps.patch
View File

@ -1,4 +1,4 @@
From 4a4a7301a534fa2c54f12c9f93a3832105b36967 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Sun, 17 Apr 2022 18:00:53 +0300
Subject: [PATCH] add an ability to disable non-system apps from the "App info"
@ -12,7 +12,7 @@ diff --git a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceC
index 03053fdeeb6..e0d2d2ee61c 100644
--- a/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java
@@ -205,6 +205,15 @@ public void onDestroy() {
@@ -205,6 +205,15 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
}
private class UninstallAndDisableButtonListener implements View.OnClickListener {
@ -28,7 +28,7 @@ index 03053fdeeb6..e0d2d2ee61c 100644
@Override
public void onClick(View v) {
@@ -236,8 +245,13 @@ public void onClick(View v) {
@@ -236,8 +245,13 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
mUserId);
if (admin != null && !uninstallBlockedBySystem) {
RestrictedLockUtils.sendShowAdminSupportDetailsIntent(mActivity, admin);
@ -43,7 +43,7 @@ index 03053fdeeb6..e0d2d2ee61c 100644
showDialogInner(ButtonActionDialogFragment.DialogType.DISABLE);
} else {
mMetricsFeatureProvider.action(
@@ -468,6 +482,25 @@ void updateUninstallButton() {
@@ -468,6 +482,25 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
}
mButtonsPref.setButton2Enabled(enabled);
@ -69,7 +69,7 @@ index 03053fdeeb6..e0d2d2ee61c 100644
}
/**
@@ -491,7 +524,9 @@ private void refreshAndFinishIfPossible(boolean removeTaskWhenFinishing) {
@@ -491,7 +524,9 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
@VisibleForTesting
void updateForceStopButton() {
@ -80,7 +80,7 @@ index 03053fdeeb6..e0d2d2ee61c 100644
// User can't force stop device admin.
Log.w(TAG, "User can't force stop device admin");
updateForceStopButtonInner(false /* enabled */);
@@ -516,6 +551,7 @@ void updateForceStopButton() {
@@ -516,6 +551,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
@VisibleForTesting
void updateForceStopButtonInner(boolean enabled) {
@ -88,7 +88,7 @@ index 03053fdeeb6..e0d2d2ee61c 100644
if (mAppsControlDisallowedBySystem) {
mButtonsPref.setButton3Enabled(false);
} else {
@@ -530,6 +566,7 @@ void uninstallPkg(String packageName, boolean allUsers) {
@@ -530,6 +566,7 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp
Uri packageUri = Uri.parse("package:" + packageName);
Intent uninstallIntent = new Intent(Intent.ACTION_UNINSTALL_PACKAGE, packageUri);
uninstallIntent.putExtra(Intent.EXTRA_UNINSTALL_ALL_USERS, allUsers);

82
Patches/LineageOS-21.0/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
View File

@ -6,9 +6,9 @@ Subject: [PATCH] Remove analytics
Change-Id: I044dd6b137b8a1d4a6dde3a63c0aaa454309341f
---
res/layout/setup_lineage_settings.xml | 29 -----------------
.../lineageos/setupwizard/FinishActivity.java | 13 --------
.../setupwizard/LineageSettingsActivity.java | 32 -------------------
.../lineageos/setupwizard/SetupWizardApp.java | 1 -
.../setupwizard/util/SetupWizardUtils.java | 13 --------
4 files changed, 75 deletions(-)
diff --git a/res/layout/setup_lineage_settings.xml b/res/layout/setup_lineage_settings.xml
@ -51,44 +51,6 @@ index 6c99b30..ea2094f 100644
<!-- Checkbox for using on-screen nav keys -->
<LinearLayout
android:id="@+id/nav_keys"
diff --git a/src/org/lineageos/setupwizard/FinishActivity.java b/src/org/lineageos/setupwizard/FinishActivity.java
index 0427a4d..11348fe 100644
--- a/src/org/lineageos/setupwizard/FinishActivity.java
+++ b/src/org/lineageos/setupwizard/FinishActivity.java
@@ -14,7 +14,6 @@ import static org.lineageos.setupwizard.SetupWizardApp.ACTION_FINISHED;
import static org.lineageos.setupwizard.SetupWizardApp.ACTION_SETUP_COMPLETE;
import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import static org.lineageos.setupwizard.SetupWizardApp.NAVIGATION_OPTION_KEY;
import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP;
@@ -172,7 +171,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
}
private void completeSetup() {
- handleEnableMetrics(mSetupWizardApp);
handleNavKeys(mSetupWizardApp);
handleRecoveryUpdate(mSetupWizardApp);
handleNavigationOption(mSetupWizardApp);
@@ -185,17 +183,6 @@ public class FinishActivity extends BaseSetupWizardActivity {
Log.i(TAG, "Setup complete!");
}
- private static void handleEnableMetrics(SetupWizardApp setupWizardApp) {
- Bundle privacyData = setupWizardApp.getSettingsBundle();
- if (privacyData != null
- && privacyData.containsKey(KEY_SEND_METRICS)) {
- LineageSettings.Secure.putInt(setupWizardApp.getContentResolver(),
- LineageSettings.Secure.STATS_COLLECTION,
- privacyData.getBoolean(KEY_SEND_METRICS)
- ? 1 : 0);
- }
- }
-
private static void handleNavKeys(SetupWizardApp setupWizardApp) {
if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
writeDisableNavkeysOption(setupWizardApp,
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index 974bd15..0632e32 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@ -165,10 +127,10 @@ index 974bd15..0632e32 100644
if (mSupportsKeyDisabler) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index 9be3b10..d7aa052 100644
index 34b8b1b..2aa217c 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -44,7 +44,6 @@ public class SetupWizardApp extends Application {
@@ -36,7 +36,6 @@ public class SetupWizardApp extends Application {
public static final String EXTRA_PREFS_SET_BACK_TEXT = "extra_prefs_set_back_text";
public static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
@ -176,3 +138,41 @@ index 9be3b10..d7aa052 100644
public static final String DISABLE_NAV_KEYS = "disable_nav_keys";
public static final String ENABLE_RECOVERY_UPDATE = "enable_recovery_update";
public static final String UPDATE_RECOVERY_PROP = "persist.vendor.recovery_update";
diff --git a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
index 7b10a1f..99f0156 100644
--- a/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
+++ b/src/org/lineageos/setupwizard/util/SetupWizardUtils.java
@@ -20,7 +20,6 @@ import static com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP;
import static org.lineageos.setupwizard.SetupWizardApp.DISABLE_NAV_KEYS;
import static org.lineageos.setupwizard.SetupWizardApp.ENABLE_RECOVERY_UPDATE;
-import static org.lineageos.setupwizard.SetupWizardApp.KEY_SEND_METRICS;
import static org.lineageos.setupwizard.SetupWizardApp.LOGV;
import static org.lineageos.setupwizard.SetupWizardApp.NAVIGATION_OPTION_KEY;
import static org.lineageos.setupwizard.SetupWizardApp.UPDATE_RECOVERY_PROP;
@@ -195,7 +194,6 @@ public class SetupWizardUtils {
Settings.Secure.TV_USER_SETUP_COMPLETE, 1);
}
- handleEnableMetrics(context);
handleNavKeys(context);
handleRecoveryUpdate();
handleNavigationOption();
@@ -293,17 +291,6 @@ public class SetupWizardUtils {
enabledState, DONT_KILL_APP);
}
- private static void handleEnableMetrics(Context context) {
- Bundle privacyData = SetupWizardApp.getSettingsBundle();
- if (privacyData != null
- && privacyData.containsKey(KEY_SEND_METRICS)) {
- LineageSettings.Secure.putInt(context.getContentResolver(),
- LineageSettings.Secure.STATS_COLLECTION,
- privacyData.getBoolean(KEY_SEND_METRICS)
- ? 1 : 0);
- }
- }
-
private static void handleNavKeys(Context context) {
if (SetupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
writeDisableNavkeysOption(context,

10
Patches/LineageOS-21.0/android_system_core/0001-Harden.patch
View File

@ -12,10 +12,10 @@ Change-Id: I46e3fc4ac896a509ab8ca90ae4ce09b820da434b
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/init/first_stage_init.cpp b/init/first_stage_init.cpp
index d050ed783..e828916d6 100644
index e48fa1554..43edd67fa 100644
--- a/init/first_stage_init.cpp
+++ b/init/first_stage_init.cpp
@@ -237,9 +237,9 @@ int FirstStageMain(int argc, char** argv) {
@@ -333,9 +333,9 @@ int FirstStageMain(int argc, char** argv) {
CHECKCALL(mkdir("/dev/pts", 0755));
CHECKCALL(mkdir("/dev/socket", 0755));
CHECKCALL(mkdir("/dev/dm-user", 0755));
@ -27,7 +27,7 @@ index d050ed783..e828916d6 100644
#undef MAKE_STR
// Don't expose the raw commandline to unprivileged processes.
CHECKCALL(chmod("/proc/cmdline", 0440));
@@ -251,7 +251,7 @@ int FirstStageMain(int argc, char** argv) {
@@ -347,7 +347,7 @@ int FirstStageMain(int argc, char** argv) {
android::base::ReadFileToString("/proc/bootconfig", &bootconfig);
gid_t groups[] = {AID_READPROC};
CHECKCALL(setgroups(arraysize(groups), groups));
@ -37,10 +37,10 @@ index d050ed783..e828916d6 100644
CHECKCALL(mknod("/dev/kmsg", S_IFCHR | 0600, makedev(1, 11)));
diff --git a/rootdir/init.rc b/rootdir/init.rc
index 2b53d883e..fa91825d7 100644
index eb67c8cd0..0a8dd41f1 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -304,6 +304,17 @@ on init
@@ -310,6 +310,17 @@ on init
write /proc/sys/kernel/sched_wakeup_granularity_ns 2000000
write /proc/sys/kernel/sched_child_runs_first 0

1
Scripts/Common/Deblob.sh
View File

@ -818,6 +818,7 @@ deblobVendorBp() {
sed -i ':a;N;s/\n/&/3;Ta;/manifest_android.hardware.drm-service.widevine.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_vendor.xiaomi.hardware.mlipay.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/vendor.qti.hardware.radio.atcmdfwd@1.0.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/com.google.android.widevine-.*.apex/!{P;D};:b;N;s/\n/&/6;Tb;d' "$bpfile";
if [ "$DOS_DEBLOBBER_REMOVE_FACE" = true ]; then
sed -i ':a;N;s/\n/&/3;Ta;/android.hardware.biometrics.face-service.22.pixel.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";
sed -i ':a;N;s/\n/&/3;Ta;/manifest_face.xml/!{P;D};:b;N;s/\n/&/8;Tb;d' "$bpfile";

6
Scripts/LineageOS-21.0/Functions.sh
View File

@ -33,7 +33,7 @@ export -f scanWorkspaceForMalware;
buildDevice() {
cd "$DOS_BUILD_BASE";
if [[ -d "$DOS_SIGNING_KEYS/$1" ]]; then
breakfast "lineage_$1-user" && mka target-files-package otatools && processRelease $1 true $2;
breakfast "lineage_$1-ap1a-user" && mka target-files-package otatools && processRelease $1 true $2;
else
echo -e "\e[0;31mNo signing keys available for $1\e[0m";
fi;
@ -42,7 +42,7 @@ export -f buildDevice;
buildDeviceDebug() {
cd "$DOS_BUILD_BASE";
brunch "lineage_$1-eng";
brunch "lineage_$1-ap1a-eng";
}
export -f buildDeviceDebug;
@ -79,7 +79,7 @@ patchWorkspaceReal() {
sh "$DOS_SCRIPTS/Rebrand.sh";
sh "$DOS_SCRIPTS_COMMON/Optimize.sh";
sh "$DOS_SCRIPTS_COMMON/Deblob.sh";
#sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh";
#sh "$DOS_SCRIPTS_COMMON/Patch_CVE.sh"; #TODO: 21REBASE
sh "$DOS_SCRIPTS_COMMON/Post.sh";
source build/envsetup.sh;
}

2
Scripts/LineageOS-21.0/Patch.sh
View File

@ -440,12 +440,14 @@ fi;
if enterAndClear "device/google/gs101"; then
git revert --no-edit adfcf46ec8c099e77cf58ec87d02bafc78a0d01e; #potential breakage
if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+8d' device.mk; fi; #fix stray
awk -i inplace '!/widevine.mk/' device.mk;
fi;
if enterAndClear "device/google/gs201"; then
if [ "$DOS_DEBLOBBER_REMOVE_CNE" = true ]; then sed -i '/google iwlan/,+8d' device.mk; fi; #fix stray
if [ "$DOS_DEBLOBBER_REMOVE_EUICC" = true ]; then sed -i '/eSIM MEP/,+4d' device.mk; fi; #fix stray
rm -rfv widevine;
awk -i inplace '!/widevine.mk/' device.mk;
fi;
if enterAndClear "device/google/gs-common"; then