From c3e76e51faa568589032336caa39f57aa0a7065d Mon Sep 17 00:00:00 2001
From: Mostafa Saleh <smostafa@google.com>
Date: Sat, 27 Jul 2024 21:46:07 +0000
Subject: [PATCH 1/2] shiba: Remove AVF assignable devices

This should be in experimental.

Bug: 352009226
Bug: 349571564
Flag: EXEMPT experimental code
Change-Id: I712caa712286c9625ca22983ba55395f08d7f22d
Signed-off-by: Mostafa Saleh <smostafa@google.com>
---
 avf/Android.bp             | 22 ----------------------
 avf/assignable_devices.xml | 22 ----------------------
 device-husky.mk            |  3 ---
 device-shiba.mk            |  3 ---
 4 files changed, 50 deletions(-)
 delete mode 100644 avf/Android.bp
 delete mode 100644 avf/assignable_devices.xml

diff --git a/avf/Android.bp b/avf/Android.bp
deleted file mode 100644
index d707db1..0000000
--- a/avf/Android.bp
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Copyright (C) 2023 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-prebuilt_etc {
-    name: "shusky_assignable_devices.xml",
-    src: "assignable_devices.xml",
-    filename: "assignable_devices.xml",
-    vendor: true,
-    relative_install_path: "avf",
-}
diff --git a/avf/assignable_devices.xml b/avf/assignable_devices.xml
deleted file mode 100644
index baacffc..0000000
--- a/avf/assignable_devices.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2023 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<devices>
-    <device>
-        <kind>eh</kind>
-        <dtbo_label>eh</dtbo_label>
-        <sysfs_path>/sys/bus/platform/devices/16d00000.eh</sysfs_path>
-    </device>
-</devices>
diff --git a/device-husky.mk b/device-husky.mk
index a2e4c36..9880c06 100644
--- a/device-husky.mk
+++ b/device-husky.mk
@@ -462,9 +462,6 @@ PRODUCT_PRODUCT_PROPERTIES ?= \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true
diff --git a/device-shiba.mk b/device-shiba.mk
index 838ee76..a50d77e 100644
--- a/device-shiba.mk
+++ b/device-shiba.mk
@@ -431,9 +431,6 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
-# AVF assignable devices xml
-PRODUCT_PACKAGES += shusky_assignable_devices.xml
-
 # Enable DeviceAsWebcam support
 PRODUCT_VENDOR_PROPERTIES += \
     ro.usb.uvc.enabled=true

From 80d1365e54f3806dda8042b409aabf912717ece5 Mon Sep 17 00:00:00 2001
From: JJ Lee <leejj@google.com>
Date: Wed, 3 Jul 2024 16:33:30 +0800
Subject: [PATCH 2/2] audio: power optimization for deepbuffer playback

Bug: 249436330
Test: build pass, cts pass, regression test pass
Flag: EXEMPT bugfix
Change-Id: Iacf4ad1ade7148491b24e7bd0f1e423f0a6d34de
Signed-off-by: JJ Lee <leejj@google.com>
---
 audio/husky/config/audio_platform_configuration.xml      | 4 ++--
 audio/ripcurrent/config/audio_platform_configuration.xml | 4 ++--
 audio/shiba/config/audio_platform_configuration.xml      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml
index 3c403c1..9b28124 100644
--- a/audio/husky/config/audio_platform_configuration.xml
+++ b/audio/husky/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
diff --git a/audio/ripcurrent/config/audio_platform_configuration.xml b/audio/ripcurrent/config/audio_platform_configuration.xml
index 2435e98..4748e6f 100644
--- a/audio/ripcurrent/config/audio_platform_configuration.xml
+++ b/audio/ripcurrent/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml
index 3c403c1..9b28124 100644
--- a/audio/shiba/config/audio_platform_configuration.xml
+++ b/audio/shiba/config/audio_platform_configuration.xml
@@ -179,8 +179,8 @@
         <usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
         <!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->
         <usecase id="UC_MMAP_PLAYBACK" dev1="0" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="40"/>
-        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 4 * 20ms buffer -->
-        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
+        <!-- for output with AUDIO_OUTPUT_FLAG_DEEP_BUFFER, 2 * 40ms buffer -->
+        <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="40" period_num="2"/>
         <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
         <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
         <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->