From 0e287409fd39d05caf14af3e08b276adbb171cdf Mon Sep 17 00:00:00 2001
From: Herbert Xue <herbertxue@google.com>
Date: Mon, 8 Jul 2024 12:30:51 +0800
Subject: [PATCH 1/2] Remove self-extractors/google_devices/staging/Android.mk

Keep Android.mk.template up to date.

Bug: 351712146
Test: make
Change-Id: Ice4e61bf2e34e495fe5a386117f9c802b5786e64
---
 .../google_devices/staging/Android.mk         | 73 -------------------
 .../staging/Android.mk.template               |  2 +-
 2 files changed, 1 insertion(+), 74 deletions(-)
 delete mode 100644 self-extractors/google_devices/staging/Android.mk

diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk
deleted file mode 100644
index 7ad5c0f..0000000
--- a/self-extractors/google_devices/staging/Android.mk
+++ /dev/null
@@ -1,73 +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.
-#
-
-LOCAL_PATH := $(call my-dir)
-
-ifneq ($(filter akita,$(TARGET_DEVICE)),)
-  $(call add-radio-file,bootloader.img)
-  $(call add-radio-file,radio.img)
-endif
-
-ifneq ($(filter akita,$(TARGET_DEVICE)),)
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := PixelQualifiedNetworksService
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonIms
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
-LOCAL_MODULE := ShannonRcs
-LOCAL_MODULE_TAGS := optional
-LOCAL_BUILT_MODULE_STEM := package.apk
-LOCAL_SYSTEM_EXT_MODULE := true
-LOCAL_PRIVILEGED_MODULE := true
-LOCAL_MODULE_OWNER := samsung
-LOCAL_MODULE_CLASS := APPS
-LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := PRESIGNED
-LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
-LOCAL_LICENSE_CONDITIONS := notice
-LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE
-include $(BUILD_PREBUILT)
-
-endif
diff --git a/self-extractors/google_devices/staging/Android.mk.template b/self-extractors/google_devices/staging/Android.mk.template
index f6ab5f2..26bf80c 100644
--- a/self-extractors/google_devices/staging/Android.mk.template
+++ b/self-extractors/google_devices/staging/Android.mk.template
@@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
 LOCAL_MODULE_OWNER := samsung
 LOCAL_MODULE_CLASS := APPS
 LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
-LOCAL_CERTIFICATE := platform
+LOCAL_CERTIFICATE := PRESIGNED
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

From c9442b63b29c5cb95bb74b0f774e370ee679b0c7 Mon Sep 17 00:00:00 2001
From: lukechang <lukechang@google.com>
Date: Fri, 12 Jul 2024 07:50:21 +0000
Subject: [PATCH 2/2] powerhint: adjust cpd target residency when interaction

Modify default BC/MC CPD target residency to 10ms.
Increase to 750ms during interaction.

Bug: 283233731
Bug: 350508026

Flag: EXEMPT bugfix

Test: power & perf cuj test

Change-Id: I6694ebd6f1f1f237bfd954eaca37cab9918c4b1e
Signed-off-by: lukechang <lukechang@google.com>
---
 powerhint-akita.json | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/powerhint-akita.json b/powerhint-akita.json
index 3186b4a..ca3c33a 100644
--- a/powerhint-akita.json
+++ b/powerhint-akita.json
@@ -229,7 +229,7 @@
         "750000",
         "10000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -239,7 +239,7 @@
         "750000",
         "10000"
       ],
-      "DefaultIndex": 0,
+      "DefaultIndex": 1,
       "ResetOnInit": true
     },
     {
@@ -1226,16 +1226,21 @@
       "Value": "DISPLAY_UPDATE_IMMINENT"
     },
     {
-      "PowerHint": "DISPLAY_INACTIVE",
-      "Node": "BigClusterPowerDownTargetResidency",
-      "Duration": 0,
-      "Value": "10000"
+      "PowerHint": "DISPLAY_IDLE",
+      "Type": "EndHint",
+      "Value": "INTERACTION"
     },
     {
-      "PowerHint": "DISPLAY_INACTIVE",
+      "PowerHint": "INTERACTION",
+      "Node": "BigClusterPowerDownTargetResidency",
+      "Duration": 2000,
+      "Value": "750000"
+    },
+    {
+      "PowerHint": "INTERACTION",
       "Node": "MidClusterPowerDownTargetResidency",
-      "Duration": 0,
-      "Value": "10000"
+      "Duration": 2000,
+      "Value": "750000"
     },
     {
       "PowerHint": "DISPLAY_INACTIVE",