From 553ae4fd8d0aacb42ba521f100ca8845c5eaa188 Mon Sep 17 00:00:00 2001
From: Rick Chen <rickctchen@google.com>
Date: Fri, 18 Feb 2022 15:20:09 +0800
Subject: [PATCH 1/3] Remove sensor HAL 1.0 config

Bug: 202249887
Test: Verify basic sampling functions on C10.
      Run VtsHalSensorsV1_0TargetTest and see no test items.
Signed-off-by: Rick Chen <rickctchen@google.com>
Change-Id: I7ce97e417ce5e8c4589845a5138010aa9288ccb3
(cherry picked from commit 1fef1eca2d08e9554c8e458a3b22ef38e637f171)
---
 manifest.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifest.xml b/manifest.xml
index bdf68411..19bf68f9 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -129,14 +129,5 @@
            <instance>default</instance>
        </interface>
     </hal>
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <kernel target-level="6"/>
 </manifest>

From 077aaa107b9d0d9906cf138093c9735ece42261b Mon Sep 17 00:00:00 2001
From: Aurimas Liutikas <aurimas@google.com>
Date: Wed, 23 Feb 2022 00:02:28 +0000
Subject: [PATCH 2/3] Revert "Turn on SELinux"

This reverts commit 3923566e2c4da78234c95c0964653890980820f2.

Reason for revert: causing com.android.pixellogger crashes

Bug: 220935985
Change-Id: If97dd3585651167762890b98c2446f3b5222f9d4
---
 BoardConfig-common.mk | 1 +
 factory_common.mk     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index ce8d71b1..a559346c 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -36,6 +36,7 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
+BOARD_BOOTCONFIG += androidboot.selinux=permissive
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
diff --git a/factory_common.mk b/factory_common.mk
index 0e2fd5c2..8befad2c 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -54,8 +54,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
 # factory should always has SELinux permissive
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
-BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+#BOARD_BOOTCONFIG += androidboot.selinux=permissive
+#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Disable Bluetooth as default in factory build
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory

From 55730686f5e922c194ce7f16cb13000fba706db7 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Wed, 23 Feb 2022 02:41:40 +0000
Subject: [PATCH 3/3] Revert "Revert "Turn on SELinux""

This reverts commit 077aaa107b9d0d9906cf138093c9735ece42261b.

Reason for revert: SELinux issues are fixed

Change-Id: I90f32b8b633988ab6f79606ac8464cbb07a861dd
---
 BoardConfig-common.mk | 1 -
 factory_common.mk     | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index a559346c..ce8d71b1 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -36,7 +36,6 @@ BOARD_KERNEL_CMDLINE += dyndbg=\"func alloc_contig_dump_pages +p\"
 BOARD_KERNEL_CMDLINE += earlycon=exynos4210,0x10A00000 console=ttySAC0,115200 androidboot.console=ttySAC0 printk.devkmsg=on
 BOARD_KERNEL_CMDLINE += cma_sysfs.experimental=Y
 BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
-BOARD_BOOTCONFIG += androidboot.selinux=permissive
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_KERNEL := false
diff --git a/factory_common.mk b/factory_common.mk
index 8befad2c..0e2fd5c2 100644
--- a/factory_common.mk
+++ b/factory_common.mk
@@ -54,8 +54,8 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_display_power_timer
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.use_content_detection_for_refresh_rate=true
 
 # factory should always has SELinux permissive
-#BOARD_BOOTCONFIG += androidboot.selinux=permissive
-#BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
+BOARD_BOOTCONFIG += androidboot.selinux=permissive
+BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 
 # Disable Bluetooth as default in factory build
 DEVICE_PACKAGE_OVERLAYS += device/google/gs201/overlay-factory