From ef68e9b578e27a07f57b5df1890cf949bbc20eec Mon Sep 17 00:00:00 2001
From: Dmitry Skiba <dskiba@google.com>
Date: Tue, 28 May 2024 23:50:44 +0000
Subject: [PATCH 1/4] Restrict kcompactd thread to middle/little cores.

Bug: 340872453
Test: Confirmed kcompactd affinity with taskset -p
Change-Id: I1cc92927dfc22d878819010aa2e9f01b5a3b8851
Signed-off-by: Dmitry Skiba <dskiba@google.com>
---
 conf/init.zuma.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index f98001b3..e7c5cb0b 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -740,6 +740,9 @@ on property:sys.boot_completed=1
     # Set kswapd affinity
     write /sys/kernel/vendor_mm/kswapd_cpu_affinity ff
 
+    # Set kcompactd affinity
+    write /sys/kernel/vendor_mm/kcompactd_cpu_affinity ff
+
     # Adjust watermark level
     write /proc/sys/vm/watermark_scale_factor 200
 

From 86e9f51a588348c58a1d08cf41b0e15ce47e4c6d Mon Sep 17 00:00:00 2001
From: Cyan_Hsieh <cyanhsieh@google.com>
Date: Wed, 29 May 2024 10:00:58 +0000
Subject: [PATCH 2/4] Switch makefile owners to MK_OWNERS

Bug: 278167548
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:621df82f7af10ff85fa290af75c729f734cb2938)
Merged-In: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
Change-Id: I7c3083ad4d881334c6f8f78d89b6a31fcd46c42e
---
 OWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OWNERS b/OWNERS
index 4bdbb973..e6ce5d01 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,2 @@
 # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
-per-file *.mk=file:device/google/gs-common:main:/OWNERS
+per-file *.mk=file:device/google/gs-common:main:/MK_OWNERS

From ed630d88aae6c8376bb6d7e0ddff2eda03033b97 Mon Sep 17 00:00:00 2001
From: jiangzining <jiangzining@google.com>
Date: Thu, 30 May 2024 15:20:22 +0800
Subject: [PATCH 3/4] [Scone] add BLUETOOTH_CONNECT to SCONE default permission

MBA Approval: b/330640278
Bug: b/343608940
Test: Build and Flash

Change-Id: I93c68928990985244993b0d66edcfc4e05a669be
---
 default-permissions.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/default-permissions.xml b/default-permissions.xml
index fd29d6bc..5061ea46 100644
--- a/default-permissions.xml
+++ b/default-permissions.xml
@@ -75,6 +75,8 @@
         <permission name="android.permission.ACTIVITY_RECOGNITION" fixed="false"/>
         <!-- Notifications -->
         <permission name="android.permission.POST_NOTIFICATIONS" fixed="false"/>
+        <!-- Used by Bluetooth Module to collect bluetooth info -->
+        <permission name="android.permission.BLUETOOTH_CONNECT" fixed="false"/>
     </exception>
 
     <exception package="com.google.android.apps.setupwizard.searchselector">

From 721a8358c65e1c884364ac2a8b3d8cca84a82c18 Mon Sep 17 00:00:00 2001
From: Dmitry Skiba <dskiba@google.com>
Date: Thu, 30 May 2024 00:50:32 +0000
Subject: [PATCH 4/4] Revert "Restrict kcompactd thread to middle/little
 cores."

This reverts commit ef68e9b578e27a07f57b5df1890cf949bbc20eec.

Reason for revert: avoid 24Q3 (will reland later)

Bug: 340872453
Change-Id: Ia217c0e0f03035267a5b53e3dadaffc4e8febfd3
---
 conf/init.zuma.rc | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/conf/init.zuma.rc b/conf/init.zuma.rc
index e7c5cb0b..f98001b3 100644
--- a/conf/init.zuma.rc
+++ b/conf/init.zuma.rc
@@ -740,9 +740,6 @@ on property:sys.boot_completed=1
     # Set kswapd affinity
     write /sys/kernel/vendor_mm/kswapd_cpu_affinity ff
 
-    # Set kcompactd affinity
-    write /sys/kernel/vendor_mm/kcompactd_cpu_affinity ff
-
     # Adjust watermark level
     write /proc/sys/vm/watermark_scale_factor 200