mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
Pick
Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
parent
11b9ae5bc4
commit
4e09464e86
@ -9,10 +9,10 @@ Subject: [PATCH] make INTERNET into a special runtime permission
|
|||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index af1a6fa9e3c5..873162098247 100644
|
index 0aafab66dabd..c66b55feff34 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1361,7 +1361,7 @@
|
@@ -1362,7 +1362,7 @@
|
||||||
<permission android:name="android.permission.INTERNET"
|
<permission android:name="android.permission.INTERNET"
|
||||||
android:description="@string/permdesc_createNetworkSockets"
|
android:description="@string/permdesc_createNetworkSockets"
|
||||||
android:label="@string/permlab_createNetworkSockets"
|
android:label="@string/permlab_createNetworkSockets"
|
||||||
|
@ -9,10 +9,10 @@ Subject: [PATCH] add a NETWORK permission group for INTERNET
|
|||||||
2 files changed, 15 insertions(+)
|
2 files changed, 15 insertions(+)
|
||||||
|
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index 873162098247..8efe5474dfea 100644
|
index c66b55feff34..a98b3bf710f3 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1355,10 +1355,20 @@
|
@@ -1356,10 +1356,20 @@
|
||||||
<!-- ======================================= -->
|
<!-- ======================================= -->
|
||||||
<eat-comment />
|
<eat-comment />
|
||||||
|
|
||||||
|
@ -26,10 +26,10 @@ index e0c2d2dc6dde..b89c46132b26 100644
|
|||||||
android.os.Build.VERSION_CODES.DONUT, 0),
|
android.os.Build.VERSION_CODES.DONUT, 0),
|
||||||
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
|
new PackageParser.NewPermissionInfo(android.Manifest.permission.READ_PHONE_STATE,
|
||||||
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
|
||||||
index 8efe5474dfea..69ddf1d37a7f 100644
|
index a98b3bf710f3..96ad65d1b04f 100644
|
||||||
--- a/core/res/AndroidManifest.xml
|
--- a/core/res/AndroidManifest.xml
|
||||||
+++ b/core/res/AndroidManifest.xml
|
+++ b/core/res/AndroidManifest.xml
|
||||||
@@ -1148,6 +1148,20 @@
|
@@ -1149,6 +1149,20 @@
|
||||||
android:description="@string/permdesc_useBiometric"
|
android:description="@string/permdesc_useBiometric"
|
||||||
android:protectionLevel="normal" />
|
android:protectionLevel="normal" />
|
||||||
|
|
||||||
|
@ -81,6 +81,7 @@ patchWorkspace() {
|
|||||||
source build/envsetup.sh;
|
source build/envsetup.sh;
|
||||||
#repopick -it pie-firewall;
|
#repopick -it pie-firewall;
|
||||||
repopick -it P_asb_2022-05;
|
repopick -it P_asb_2022-05;
|
||||||
|
repopick -it P_asb_2022-06;
|
||||||
|
|
||||||
sh "$DOS_SCRIPTS/Patch.sh";
|
sh "$DOS_SCRIPTS/Patch.sh";
|
||||||
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";
|
||||||
|
@ -98,7 +98,7 @@ sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap
|
|||||||
if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence
|
if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence
|
||||||
sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/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 := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS)
|
||||||
awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
|
awk -i inplace '!/Email/' target/product/core.mk; #Remove Email
|
||||||
sed -i 's/2022-01-05/2022-05-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-05 #XXX
|
sed -i 's/2022-01-05/2022-06-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-06 #XXX
|
||||||
fi;
|
fi;
|
||||||
|
|
||||||
if enterAndClear "build/soong"; then
|
if enterAndClear "build/soong"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user