mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-12 01:14:22 -05:00
19.1+20.0: December 2024 ASB picks
Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
parent
125911311b
commit
639719210a
@ -1078,6 +1078,7 @@
|
||||
<apn carrier="Vodafone PT Internet" mcc="268" mnc="01" apn="net2.vodafone.pt" proxy="iproxy.vodafone.pt" port="80" mmsc="http://mms.vodafone.pt/servlets/mms" mmsproxy="iproxy.vodafone.pt" mmsport="80" type="default,supl,mms" />
|
||||
<apn carrier="Vodafone PT WAP MMS" mcc="268" mnc="01" apn="vas.vodafone.pt" user="vas" password="vas" mmsc="http://mms/servlets/mms" mmsproxy="213.30.27.63" mmsport="8799" type="mms" />
|
||||
<apn carrier="Vodafone PT WAP" mcc="268" mnc="01" apn="wap.vodafone.pt" user="wap" password="wap" proxy="172.16.19.50" port="8799" type="default,supl" />
|
||||
<apn carrier="DIGI PT" mcc="268" mnc="02" apn="internet" authtype="1" type="default,supl" />
|
||||
<apn carrier="NOS/WTF Internet" mcc="268" mnc="03" apn="umts" type="default,supl,dun" />
|
||||
<apn carrier="NOS MMS" mcc="268" mnc="03" apn="mms" mmsc="http://mmsc:10021/mmsc" mmsproxy="62.169.66.5" mmsport="8799" authtype="1" type="mms" />
|
||||
<apn carrier="WTF MMS" mcc="268" mnc="03" apn="umts" mmsc="http://mmsc:10021/mmsc" mmsproxy="62.169.66.5" mmsport="8799" authtype="1" type="mms" />
|
||||
|
@ -78,7 +78,7 @@ index 5ddea4605..3eca8235c 100644
|
||||
|
||||
public boolean isReviewRequired() {
|
||||
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt
|
||||
index aed275d8a..2cc012479 100644
|
||||
index 436612d58..6a20a6164 100644
|
||||
--- a/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt
|
||||
+++ b/PermissionController/src/com/android/permissioncontroller/permission/service/AutoRevokePermissions.kt
|
||||
@@ -108,7 +108,7 @@ suspend fun revokeAppPermissions(
|
||||
@ -91,7 +91,7 @@ index aed275d8a..2cc012479 100644
|
||||
}
|
||||
}
|
||||
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
|
||||
index 2216802f3..7bca04085 100644
|
||||
index e7f4874e4..738b5d0fa 100644
|
||||
--- a/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
|
||||
+++ b/PermissionController/src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt
|
||||
@@ -597,6 +597,7 @@ object KotlinUtils {
|
||||
@ -104,7 +104,7 @@ index 2216802f3..7bca04085 100644
|
||||
// Do not touch permissions fixed by the system, or permissions that cannot be granted
|
||||
@@ -827,6 +828,7 @@ object KotlinUtils {
|
||||
var newFlags = perm.flags
|
||||
var isGranted = perm.isGrantedIncludingAppOp
|
||||
var isGranted = perm.isGranted
|
||||
val supportsRuntime = group.packageInfo.targetSdkVersion >= Build.VERSION_CODES.M
|
||||
+ || Utils.isSpecialRuntimePermission(perm.name)
|
||||
var shouldKill = false
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit afd4f3b1d63cdbf680cf0eb2b45fd279a79348ac
|
||||
Subproject commit b48fe4d1f9aea4d320c9c2e3c76284a5a46aaffd
|
@ -68,7 +68,7 @@ patchWorkspaceReal() {
|
||||
|
||||
source build/envsetup.sh;
|
||||
#repopick -ift twelve-bt-sbc-hd-dualchannel;
|
||||
repopick -it S_asb_2024-11;
|
||||
repopick -it S_asb_2024-12
|
||||
|
||||
sh "$DOS_SCRIPTS/Patch.sh";
|
||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||
|
@ -95,7 +95,6 @@ applyPatch "$DOS_PATCHES_COMMON/android_build/0001-verity-openssl3.patch"; #Fix
|
||||
sed -i '75i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches.
|
||||
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/2024-10-05/2024-11-05/' core/version_defaults.mk; #Bump Security String #S_asb_2024-11
|
||||
fi;
|
||||
|
||||
if enterAndClear "build/soong"; then
|
||||
|
@ -162,7 +162,8 @@ patchWorkspaceReal() {
|
||||
verifyAllPlatformTags;
|
||||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||
|
||||
#source build/envsetup.sh;
|
||||
source build/envsetup.sh;
|
||||
repopick -it T_asb_2024-12;
|
||||
|
||||
sh "$DOS_SCRIPTS/Patch.sh";
|
||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||
|
Loading…
Reference in New Issue
Block a user