From 38305941b629a4ec6282e8f14a072678d7fa6df2 Mon Sep 17 00:00:00 2001
From: Edmond Chung <edmondchung@google.com>
Date: Tue, 2 Aug 2022 11:41:55 -0700
Subject: [PATCH 1/3] Camera: Create video_bokeh_node folder at boot

Bug: 241054363
Test: Build, run on user-build
Change-Id: I8403c58ed5e9fa6f9bb68012298855d84cfec23e
---
 conf/init.gs201.rc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/init.gs201.rc b/conf/init.gs201.rc
index 5d945a59..07f60a9e 100644
--- a/conf/init.gs201.rc
+++ b/conf/init.gs201.rc
@@ -395,6 +395,7 @@ on post-fs-data
 
     # Permissions Camera
     mkdir /data/vendor/camera 0770 system camera
+    mkdir /data/vendor/camera/video_bokeh_node 0770 system camera
     chmod 0755 /sys/kernel/debug/tracing
     restorecon /sys/kernel/debug/tracing/trace_marker
 

From e00f77a9018e002af266519654108e6babfb8959 Mon Sep 17 00:00:00 2001
From: Denny cy Lee <dennycylee@google.com>
Date: Wed, 20 Jul 2022 11:28:55 +0000
Subject: [PATCH 2/3] HwInfo: Move hardware info sepolicy to  hardware pixel

Bug: 215271971
Test: no sepolicy for hardware info
Change-Id: I36d777dc0068ad7a4d1237797b69e421587f0c19
---
 device.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/device.mk b/device.mk
index 5e2570af..7b13ccea 100644
--- a/device.mk
+++ b/device.mk
@@ -1178,3 +1178,6 @@ PRODUCT_COPY_FILES += \
 
 # Call deleteAllKeys if vold detects a factory reset
 PRODUCT_VENDOR_PROPERTIES += ro.crypto.metadata_init_delete_all_keys.enabled?=true
+
+# Hardware Info
+include hardware/google/pixel/HardwareInfo/HardwareInfo.mk

From 45c6492990eb8ca636bc55341e023ea4166c3f60 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Mon, 1 Aug 2022 14:19:45 +0800
Subject: [PATCH 3/3] Remove IBluetoothCcc from common setting

Bug: 239658601
Test: vts-tradefed run vts -m vts_treble_vintf_vendor_test
Change-Id: I6debd45beb274321a055bba4d551f4646ebf0663
---
 device_framework_matrix_product.xml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml
index 7744771b..40181c61 100644
--- a/device_framework_matrix_product.xml
+++ b/device_framework_matrix_product.xml
@@ -149,14 +149,6 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
-        <name>hardware.google.bluetooth.ccc</name>
-        <version>1.1</version>
-        <interface>
-            <name>IBluetoothCcc</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
     <hal format="hidl" optional="true">
         <name>hardware.google.bluetooth.ewp</name>
         <version>1.0</version>