Small tweaks

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-11-06 11:22:43 -04:00
parent 5c8250bbdd
commit f2b9eb8e8b
4 changed files with 6 additions and 7 deletions

View File

@ -16,7 +16,7 @@ Change-Id: I79c0ed4ab97494434edc6c308a8a54bd123c02ee
create mode 100644 src/com/android/settings/applications/specialaccess/sensor/SensorAccess.java create mode 100644 src/com/android/settings/applications/specialaccess/sensor/SensorAccess.java
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 0893b5c318..48d6b24f70 100644 index 065a41322c..7f7000be66 100644
--- a/res/values-de/strings.xml --- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml +++ b/res/values-de/strings.xml
@@ -4667,6 +4667,9 @@ @@ -4667,6 +4667,9 @@
@ -30,7 +30,7 @@ index 0893b5c318..48d6b24f70 100644
<string name="rtt_settings_no_visible" msgid="7440356831140948382"></string> <string name="rtt_settings_no_visible" msgid="7440356831140948382"></string>
<string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string> <string name="rtt_settings_visible_during_call" msgid="7866181103286073700"></string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index a1461ea6a2..72af9b3a47 100644 index d6d19a7ceb..68f543974b 100644
--- a/res/values-fr/strings.xml --- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml
@@ -4666,6 +4666,9 @@ @@ -4666,6 +4666,9 @@

View File

@ -344,7 +344,7 @@ fi;
if enterAndClear "device/motorola/clark"; then if enterAndClear "device/motorola/clark"; then
sed -i 's/0xA04D/0xA04D|0xA052/' board-info.txt; #Allow installing on Nougat bootloader, assume the user is running the correct modem sed -i 's/0xA04D/0xA04D|0xA052/' board-info.txt; #Allow installing on Nougat bootloader, assume the user is running the correct modem
rm board-info.txt; #Never restrict installation rm board-info.txt; #Never restrict installation
echo "recovery_only('" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware echo "recovery_only(\`" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware
echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te; echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te;

View File

@ -312,7 +312,7 @@ awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken
fi; fi;
if enterAndClear "device/motorola/clark"; then if enterAndClear "device/motorola/clark"; then
echo "recovery_only('" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware echo "recovery_only(\`" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware
echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te; echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te;
@ -321,7 +321,7 @@ fi;
if enterAndClear "device/motorola/msm8916-common"; then if enterAndClear "device/motorola/msm8916-common"; then
rm sepolicy/recovery.te; rm sepolicy/recovery.te;
echo "recovery_only('" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware echo "recovery_only(\`" >> sepolicy/recovery.te; #304224: Allow recovery to unzip and chmod modem firmware
echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te; echo " allow firmware_file labeledfs:filesystem associate;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:dir rw_dir_perms;" >> sepolicy/recovery.te;
echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te; echo " allow recovery firmware_file:file create_file_perms;" >> sepolicy/recovery.te;

View File

@ -159,7 +159,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/^5.12/0001.patch
@ -176,5 +175,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
editKernelLocalversion "-dos.p176" editKernelLocalversion "-dos.p175"
cd "$DOS_BUILD_BASE" cd "$DOS_BUILD_BASE"