PeterGSI/patches
1
0
Fork 2
Code Issues Pull requests Projects Releases Wiki Activity

Update all patches for AOSP 16

Browse source 
We don't use lineage-sdk anymore and instead push spninfo to our vendor
repo.

No dialer patches needed anymore.
This commit is contained in:
Peter Cai 2025-06-21 11:21:19 -04:00
parent a2da963dff
commit f58c42c036
12 changed files with 24 additions and 260 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lineage-sdk/0001-Stop-using-resource-processor.patch
View file

@ -1,24 +0,0 @@
From 6acc862452fd91732f63afa4a3829d0e249355e0 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 16 Mar 2025 13:55:53 -0400
Subject: [PATCH 1/2] Stop using resource processor
---
Android.bp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Android.bp b/Android.bp
index 0b368c8e..a2dff379 100644
--- a/Android.bp
+++ b/Android.bp
@@ -5,6 +5,7 @@
android_app {
name: "org.lineageos.platform-res",
+ use_resource_processor: false,
sdk_version: "core_platform",
certificate: "platform",
--
2.48.1

133
lineage-sdk/0002-Add-spninfo-schema.patch
View file

@ -1,133 +0,0 @@
From 6cf57340bf1d906438a112942763c12eb35feb51 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 16 Mar 2025 13:56:06 -0400
Subject: [PATCH 2/2] Add spninfo / schema
---
lib/SpnInfo.xsd | 47 +++++++++++++++++++++++++++++++++++++
lib/schema/current.txt | 40 +++++++++++++++++++++++++++++++
lib/schema/last_current.txt | 0
lib/schema/last_removed.txt | 0
lib/schema/removed.txt | 1 +
5 files changed, 88 insertions(+)
create mode 100644 lib/SpnInfo.xsd
create mode 100644 lib/schema/current.txt
create mode 100644 lib/schema/last_current.txt
create mode 100644 lib/schema/last_removed.txt
create mode 100644 lib/schema/removed.txt
diff --git a/lib/SpnInfo.xsd b/lib/SpnInfo.xsd
new file mode 100644
index 00000000..d30630dc
--- /dev/null
+++ b/lib/SpnInfo.xsd
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 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.
+ -->
+<xs:schema version="2.0"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="sensitivePNS">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="sensitivePN" maxOccurs="unbounded" type="sensitivePN" />
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:complexType name="sensitivePN">
+ <xs:sequence>
+ <xs:element name="item" maxOccurs="unbounded" type="item" />
+ </xs:sequence>
+ <xs:attribute name="network" type="xs:string" use="required" />
+ </xs:complexType>
+
+ <xs:complexType name="item">
+ <xs:sequence>
+ <xs:element name="number" type="xs:string" />
+ <xs:element name="name" minOccurs="0" type="xs:string" />
+ <xs:element name="categories" minOccurs="0" type="xs:string" />
+ <xs:element name="languages" minOccurs="0" type="xs:string" />
+ <xs:element name="organization" minOccurs="0" type="xs:string" />
+ <xs:element name="website" minOccurs="0" type="xs:anyURI" />
+ </xs:sequence>
+ </xs:complexType>
+</xs:schema>
diff --git a/lib/schema/current.txt b/lib/schema/current.txt
new file mode 100644
index 00000000..13e52c67
--- /dev/null
+++ b/lib/schema/current.txt
@@ -0,0 +1,40 @@
+// Signature format: 2.0
+package org.lineageos.lib.phone.spn {
+
+ public class Item {
+ ctor public Item();
+ method public String getCategories();
+ method public String getLanguages();
+ method public String getName();
+ method public String getNumber();
+ method public String getOrganization();
+ method public String getWebsite();
+ method public void setCategories(String);
+ method public void setLanguages(String);
+ method public void setName(String);
+ method public void setNumber(String);
+ method public void setOrganization(String);
+ method public void setWebsite(String);
+ }
+
+ public class SensitivePN {
+ ctor public SensitivePN();
+ method public java.util.List<org.lineageos.lib.phone.spn.Item> getItem();
+ method public String getNetwork();
+ method public void setNetwork(String);
+ }
+
+ public class SensitivePNS {
+ ctor public SensitivePNS();
+ method public java.util.List<org.lineageos.lib.phone.spn.SensitivePN> getSensitivePN();
+ }
+
+ public class XmlParser {
+ ctor public XmlParser();
+ method public static org.lineageos.lib.phone.spn.SensitivePNS read(java.io.InputStream) throws javax.xml.datatype.DatatypeConfigurationException, java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static String readText(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ method public static void skip(org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+ }
+
+}
+
diff --git a/lib/schema/last_current.txt b/lib/schema/last_current.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/schema/last_removed.txt b/lib/schema/last_removed.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/lib/schema/removed.txt b/lib/schema/removed.txt
new file mode 100644
index 00000000..d802177e
--- /dev/null
+++ b/lib/schema/removed.txt
@@ -0,0 +1 @@
+// Signature format: 2.0
--
2.48.1

24
packages/apps/Dialer/0001-Downgrade-target_sdk_version-to-34-for-now.patch
View file

@ -1,24 +0,0 @@
From 4a576ac73698b2232c51a4b6b3c9a21845801136 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 6 Oct 2024 14:22:49 -0400
Subject: [PATCH 1/3] Downgrade target_sdk_version to 34 for now
---
Android.bp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Android.bp b/Android.bp
index 388f4c00c..498e7c8f0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -207,6 +207,7 @@ android_app {
"java/com/android/voicemail/impl/configui/res",
"java/com/android/voicemail/impl/res",
],
+ target_sdk_version: "34",
sdk_version: "system_current",
srcs: [
"java/**/I*.aidl",
--
2.48.1

31
packages/apps/Dialer/0002-Make-java_sdk_library-dependencies-explicit.patch
View file

@ -1,31 +0,0 @@
From 080c04159988f202694f087f442e3e32f18d4625 Mon Sep 17 00:00:00 2001
From: Jihoon Kang <jihoonkang@google.com>
Date: Fri, 30 Aug 2024 00:29:34 +0000
Subject: [PATCH 2/3] Make java_sdk_library dependencies explicit
modules should specify the submodule of java_sdk_library that the module
actually depends on
Test: CI
Bug: 358613520
Change-Id: I23a22e9d3dc001a5b061177273d407b01bb77a50
---
Android.bp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Android.bp b/Android.bp
index 498e7c8f0..299c1a6e7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -102,7 +102,7 @@ android_app {
exclude_srcs: ["java/com/android/dialer/rootcomponentgenerator/*.java"],
libs: [
"auto_value_annotations",
- "org.apache.http.legacy",
+ "org.apache.http.legacy.stubs.system",
],
optimize: {
proguard_flags_files: [
--
2.48.1

24
packages/apps/Dialer/0003-Opt-out-from-the-resource-processor-for-now.patch
View file

@ -1,24 +0,0 @@
From fa83fab06f1bd59551b926a224e0cf4cdfcb86da Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sun, 16 Mar 2025 13:51:15 -0400
Subject: [PATCH 3/3] Opt-out from the resource processor (for now)
---
Android.bp | 1 +
1 file changed, 1 insertion(+)
diff --git a/Android.bp b/Android.bp
index 299c1a6e7..b35b8913e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -9,6 +9,7 @@ package {
android_app {
name: "Dialer",
+ use_resource_processor: false,
aaptflags: [
"--auto-add-overlay",
"--extra-packages com.android.contacts.common",
--
2.48.1

10
packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch
View file

@ -1,4 +1,4 @@
From 09d183a632ab5ba6ef0f1f76765fc94ef24035f4 Mon Sep 17 00:00:00 2001
From 94e3b8c516fb084eb8b76f71e3bf2de20ace6a3d Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Mon, 11 Oct 2021 20:48:44 -0700
Subject: [PATCH 1/3] Expose themed icon setting in ThemePicker
@ -10,10 +10,10 @@ Change-Id: I44e9288c3de13a3604b7a03857ec400753317d9a
2 files changed, 6 insertions(+)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 517bd6d..89291c1 100644
index 1bce9b3..030c67b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -67,6 +67,9 @@
@@ -68,6 +68,9 @@
<meta-data
android:name="com.android.launcher3.grid.control"
android:value="${packageName}.grid_control" />
@ -24,10 +24,10 @@ index 517bd6d..89291c1 100644
</application>
diff --git a/quickstep/AndroidManifest-launcher.xml b/quickstep/AndroidManifest-launcher.xml
index 80d8154..813ef75 100644
index d6aa886..080c4d6 100644
--- a/quickstep/AndroidManifest-launcher.xml
+++ b/quickstep/AndroidManifest-launcher.xml
@@ -65,6 +65,9 @@
@@ -66,6 +66,9 @@
<meta-data
android:name="com.android.launcher3.grid.control"
android:value="${packageName}.grid_control" />

2
packages/apps/Launcher3/0002-Disable-QSB-in-BuildConfig.patch
View file

@ -1,4 +1,4 @@
From c2cafe53a8b6acf97dc9a634ada0d4ab53b5fd9f Mon Sep 17 00:00:00 2001
From 02763a96fd66df156cff0d7da383d9d3d9d3d850 Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Fri, 7 Jul 2023 18:13:32 -0400
Subject: [PATCH 2/3] Disable QSB in BuildConfig

14
packages/apps/Launcher3/0003-Properly-expose-GridCustomizationsProvider.patch
View file

@ -1,4 +1,4 @@
From de7b698be0f1e01b337672d919854e3a28b8685f Mon Sep 17 00:00:00 2001
From ae08ed286496493afcf23a8abe80cdf3859926d7 Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Fri, 1 Nov 2019 23:17:59 +0100
Subject: [PATCH 3/3] Properly expose GridCustomizationsProvider
@ -9,17 +9,17 @@ Change-Id: I8268a215257ae0e399c56ac8b44cdfdff8cc92a0
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
index 80d2eac..53bdfff 100644
index 46f0e41..f728b76 100644
--- a/AndroidManifest-common.xml
+++ b/AndroidManifest-common.xml
@@ -138,7 +138,9 @@
<provider
android:name="com.android.launcher3.graphics.GridCustomizationsProvider"
@@ -136,7 +136,9 @@
android:name="com.android.launcher3.graphics.LauncherCustomizationProvider"
android:authorities="${applicationId}.grid_control"
android:permission="android.permission.BIND_WALLPAPER"
- android:exported="true" />
+ android:exported="true"
+ android:exported="true"
+ android:writePermission="${packageName}.permission.WRITE_SETTINGS"
+ android:readPermission="${packageName}.permission.READ_SETTINGS" />
+ android:readPermission="${packageName}.permission.READ_SETTINGS"/>
<!--
The settings activity. To extend point settings_fragment_name to appropriate fragment class

6
packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch
View file

@ -1,4 +1,4 @@
From bc50b3024c266f307ce804ef1887062cf1f34944 Mon Sep 17 00:00:00 2001
From 87ef7ebbcf6efe1c25a2c1d514d022859433c55f Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Fri, 1 Nov 2019 21:14:29 +0100
Subject: [PATCH 1/4] Add wallpaper privapp whitelist
@ -11,10 +11,10 @@ Change-Id: I044b1d9201ac0b8780fc37a387f401f3dd0ddeac
create mode 100644 privapp_whitelist_com.android.wallpaper.xml
diff --git a/Android.bp b/Android.bp
index 58e6413..40e2241 100644
index 5efee51..1938697 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,6 +140,15 @@ android_app {
@@ -151,6 +151,15 @@ android_app {
platform_apis: true,
manifest: "AndroidManifest.xml",
additional_manifests: [":WallpaperPicker2_Manifest"],

8
packages/apps/ThemePicker/0002-Add-wallpaper-default-permissions.patch
View file

@ -1,4 +1,4 @@
From b255f705538f7e55d445c60c1a12f60dd309df1d Mon Sep 17 00:00:00 2001
From 7eae80748fa17836e787c018808d6b87458b8ea9 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 15 Sep 2020 03:27:19 +0200
Subject: [PATCH 2/4] Add wallpaper default permissions
@ -11,10 +11,10 @@ Change-Id: If43a594da31fbab9280ce45b049737f6c534b620
create mode 100644 default_permissions_com.android.wallpaper.xml
diff --git a/Android.bp b/Android.bp
index 40e2241..614739a 100644
index 1938697..1d475af 100644
--- a/Android.bp
+++ b/Android.bp
@@ -140,7 +140,10 @@ android_app {
@@ -151,7 +151,10 @@ android_app {
platform_apis: true,
manifest: "AndroidManifest.xml",
additional_manifests: [":WallpaperPicker2_Manifest"],
@ -26,7 +26,7 @@ index 40e2241..614739a 100644
overrides: ["WallpaperPicker", "WallpaperPicker2"],
static_libs: ["ThemePickerApplicationLib"],
}
@@ -152,3 +155,11 @@ prebuilt_etc_xml {
@@ -163,3 +166,11 @@ prebuilt_etc_xml {
filename_from_src: true,
sub_dir: "permissions",
}

4
packages/apps/ThemePicker/0003-Specify-we-read-and-write-launcher-settings.patch
View file

@ -1,4 +1,4 @@
From 623014b94ae4bb08328684bb077b05973ab858eb Mon Sep 17 00:00:00 2001
From 5e5726c6def41758424960f9f25f98a8fe6d2ef0 Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Fri, 1 Nov 2019 23:17:08 +0100
Subject: [PATCH 3/4] Specify we read and write launcher settings
@ -9,7 +9,7 @@ Change-Id: Ifc8196588443b007602118389ca76d34ab531f14
1 file changed, 3 insertions(+)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f89ff6e..95f5b0e 100755
index 46f364c..5f74c5a 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -60,6 +60,9 @@

4
packages/apps/ThemePicker/0004-Add-permission-for-launcher-preview-rendering.patch
View file

@ -1,4 +1,4 @@
From 5880006d7be5eeb3fff8a6d9154ae16e2e6ffac7 Mon Sep 17 00:00:00 2001
From 987c8e91cc42db76d54b0f93ac09c3c10d1e5a0d Mon Sep 17 00:00:00 2001
From: Danny Lin <danny@kdrag0n.dev>
Date: Tue, 5 Oct 2021 22:40:58 -0700
Subject: [PATCH 4/4] Add permission for launcher preview rendering
@ -10,7 +10,7 @@ Change-Id: Ie707dcd98161e8f5993b0504295fddc3f395cd20
2 files changed, 2 insertions(+)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95f5b0e..8c55499 100755
index 5f74c5a..7d43fd6 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -13,6 +13,7 @@