Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-25 23:49:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Picks

Browse Source 
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-12-09 21:22:33 -05:00
parent a3c17d356d
commit f20edeeb0c
No known key found for this signature in database
GPG Key ID: B286E9F57A07424B
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Patches/LineageOS-19.1/android_frameworks_base/0007-Always_Restict_Serial.patch
View File

@ -10,7 +10,7 @@ requiring the READ_PHONE_STATE permission.
1 file changed, 1 insertion(+), 6 deletions(-) 1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 884770bc5f3c..babf76e867c9 100644 index ffa290649580..fc14d5dd247e 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java --- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -4526,12 +4526,7 @@ public class ActivityManagerService extends IActivityManager.Stub @@ -4526,12 +4526,7 @@ public class ActivityManagerService extends IActivityManager.Stub

8
Patches/LineageOS-19.1/android_frameworks_base/0014-Automatic_Reboot.patch
View File

@ -57,7 +57,7 @@ index cdec5a47b240..3210af7bdebc 100644
<protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" /> <protected-broadcast android:name="com.android.settingslib.action.REGISTER_SLICE_RECEIVER" />
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 2ac75d6e8552..b419ed0d4c4a 100644 index e5e98284c1de..c8c9116ec00a 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -187,6 +187,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, @@ -187,6 +187,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
@ -119,7 +119,7 @@ index 2ac75d6e8552..b419ed0d4c4a 100644
/** /**
* Let's us know when the device is waking up. * Let's us know when the device is waking up.
*/ */
@@ -1598,6 +1622,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, @@ -1602,6 +1626,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen");
showLocked(options); showLocked(options);
@ -130,7 +130,7 @@ index 2ac75d6e8552..b419ed0d4c4a 100644
} }
private void lockProfile(int userId) { private void lockProfile(int userId) {
@@ -1794,6 +1822,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, @@ -1798,6 +1826,12 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
} }
} }
} }
@ -143,7 +143,7 @@ index 2ac75d6e8552..b419ed0d4c4a 100644
} }
} }
}; };
@@ -2371,6 +2405,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, @@ -2375,6 +2409,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
mHideAnimationRun = false; mHideAnimationRun = false;
adjustStatusBarLocked(); adjustStatusBarLocked();
sendUserPresentBroadcast(); sendUserPresentBroadcast();

4
Patches/LineageOS-19.1/android_packages_apps_Bluetooth/0001-constify_JNINativeMethod.patch
View File

@ -88,10 +88,10 @@ index 791e42a0e..cb0082244 100644
{"initNative", "()V", (void*)initNative}, {"initNative", "()V", (void*)initNative},
{"cleanupNative", "()V", (void*)cleanupNative}, {"cleanupNative", "()V", (void*)cleanupNative},
diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp diff --git a/jni/com_android_bluetooth_btservice_AdapterService.cpp b/jni/com_android_bluetooth_btservice_AdapterService.cpp
index 62c7d522d..9fa89ded9 100644 index e26171ef8..12467ff63 100644
--- a/jni/com_android_bluetooth_btservice_AdapterService.cpp --- a/jni/com_android_bluetooth_btservice_AdapterService.cpp
+++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp +++ b/jni/com_android_bluetooth_btservice_AdapterService.cpp
@@ -1689,7 +1689,7 @@ static int getMetricIdNative(JNIEnv* env, jobject obj, jbyteArray address) { @@ -1690,7 +1690,7 @@ static int getMetricIdNative(JNIEnv* env, jobject obj, jbyteArray address) {
return sBluetoothInterface->get_metric_id(addr_obj); return sBluetoothInterface->get_metric_id(addr_obj);
} }

3
Scripts/LineageOS-19.1/Functions.sh
View File

@ -66,9 +66,10 @@ patchWorkspaceReal() {
verifyAllPlatformTags; verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
#source build/envsetup.sh; source build/envsetup.sh;
#repopick -ift twelve-bt-sbc-hd-dualchannel; #repopick -ift twelve-bt-sbc-hd-dualchannel;
#repopick -it twelve-colors; #repopick -it twelve-colors;
repopick -it S_asb_2023-12 -e 376774;
sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

10
Scripts/LineageOS-19.1/Patch.sh
View File

@ -98,6 +98,7 @@ sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap
awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX awk -i inplace '!/updatable_apex.mk/' target/product/generic_system.mk; #Disable APEX
sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 23/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
#sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig #sed -i 's/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true/PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false/' core/product_config.mk; #broken by hardenDefconfig
sed -i 's/2023-11-05/2023-12-05/' core/version_defaults.mk; #Bump Security String #Q_asb_2023-11 #XXX #S_asb_2023-12
fi; fi;
if enterAndClear "build/soong"; then if enterAndClear "build/soong"; then
@ -105,6 +106,10 @@ applyPatch "$DOS_PATCHES/android_build_soong/0001-Enable_fwrapv.patch"; #Use -fw
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS) if [ "$DOS_GRAPHENE_MALLOC" = true ]; then applyPatch "$DOS_PATCHES/android_build_soong/0002-hm_apex.patch"; fi; #(GrapheneOS)
fi; fi;
if enterAndClear "cts"; then
git fetch https://github.com/LineageOS/android_cts refs/changes/75/376775/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-12
fi;
if enterAndClear "external/chromium-webview"; then if enterAndClear "external/chromium-webview"; then
if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available if [ "$(type -t DOS_WEBVIEW_CHERRYPICK)" = "alias" ] ; then DOS_WEBVIEW_CHERRYPICK; fi; #Update the WebView to latest if available
if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available if [ "$DOS_WEBVIEW_LFS" = true ]; then git lfs pull; fi; #Ensure the objects are available
@ -121,6 +126,10 @@ applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2.
fi; fi;
fi; fi;
if enterAndClear "external/pdfium"; then
git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/76/376776/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-12
fi;
if enterAndClear "external/SecureCamera"; then if enterAndClear "external/SecureCamera"; then
sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name sed -i '/LOCAL_MODULE/s/Camera/SecureCamera/' Android.mk; #Change module name
sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others sed -i '11iLOCAL_OVERRIDES_PACKAGES := Camera Camera2 LegacyCamera Snap OpenCamera' Android.mk; #Replace the others
@ -408,6 +417,7 @@ applyPatch "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #
fi; fi;
if enterAndClear "system/netd"; then if enterAndClear "system/netd"; then
git fetch https://github.com/LineageOS/android_system_netd refs/changes/09/376809/1 && git cherry-pick FETCH_HEAD; #S_asb_2023-12
applyPatch "$DOS_PATCHES/android_system_netd/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS) applyPatch "$DOS_PATCHES/android_system_netd/0001-Network_Permission.patch"; #Expose the NETWORK permission (GrapheneOS)
fi; fi;