From fb9389921696e713056e113a5c249e5ce6696893 Mon Sep 17 00:00:00 2001 From: Chiawei Wang Date: Mon, 28 Jun 2021 02:05:15 +0800 Subject: Add the customized max cached processes number for B4/S4 Bug: 190531672 Test: make Test: dumpsys activity | grep CUR_MAX_CACHED_PROCESSES Change-Id: I7fbd371a146121dec812a3233f79ccf6737db130 --- bonito/overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ sargo/overlay/frameworks/base/core/res/res/values/config.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/bonito/overlay/frameworks/base/core/res/res/values/config.xml b/bonito/overlay/frameworks/base/core/res/res/values/config.xml index 36244cf2..6629dc40 100755 --- a/bonito/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/config.xml @@ -703,4 +703,6 @@ 38px 39px + + 64 diff --git a/sargo/overlay/frameworks/base/core/res/res/values/config.xml b/sargo/overlay/frameworks/base/core/res/res/values/config.xml index dc0b0ecd..307435dd 100755 --- a/sargo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/config.xml @@ -704,4 +704,6 @@ 40px 41px + + 64 -- cgit v1.2.3 From 9485129e21438315a67b532b204289085296c8cc Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Fri, 10 Sep 2021 02:24:56 +0000 Subject: [DO NOT MERGE] Customize Bonito/Sargo status bar system icons padding 1. Move dimen res from config.xml to dimen.xml 2. Adjust the padding system_icons_keyguard_padding_end Test: atest SystemUITests Test: manual review visual Bug: 195670442 Fixes: 198252802 Fixes: 199461075 Fixes: 199459128 Change-Id: Ied4d98bcc2347ac0fc55cf66dbe32b06b8c2efec Merged-In: I49810a58eeac65c0fa5c7f69f7465e44220fb00d --- .../frameworks/base/core/res/res/values/config.xml | 5 ---- .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++ .../base/packages/SystemUI/res/values/dimens.xml | 8 ++++-- .../frameworks/base/core/res/res/values/config.xml | 5 ---- .../frameworks/base/core/res/res/values/dimens.xml | 33 ++++++++++++++++++++++ .../base/packages/SystemUI/res/values/dimens.xml | 8 ++++-- 6 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 bonito/overlay/frameworks/base/core/res/res/values/dimens.xml create mode 100644 sargo/overlay/frameworks/base/core/res/res/values/dimens.xml diff --git a/bonito/overlay/frameworks/base/core/res/res/values/config.xml b/bonito/overlay/frameworks/base/core/res/res/values/config.xml index 6629dc40..412db9b3 100755 --- a/bonito/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/config.xml @@ -698,11 +698,6 @@ G020D - - 39px - 38px - 39px - 64 diff --git a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 00000000..0a7c4e5b --- /dev/null +++ b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,33 @@ + + + + + + 39px + 38px + 39px + + + 28dp + + 28dp + + + 3px + diff --git a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 34a55277..8295f934 100644 --- a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -17,8 +17,12 @@ --> 28px - - 28dp + + + @*android:dimen/status_bar_height_portrait + + + 8.5dp 500px diff --git a/sargo/overlay/frameworks/base/core/res/res/values/config.xml b/sargo/overlay/frameworks/base/core/res/res/values/config.xml index 307435dd..ff067971 100755 --- a/sargo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/config.xml @@ -699,11 +699,6 @@ G020H - - 39px - 40px - 41px - 64 diff --git a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml new file mode 100644 index 00000000..0a7c4e5b --- /dev/null +++ b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -0,0 +1,33 @@ + + + + + + 39px + 38px + 39px + + + 28dp + + 28dp + + + 3px + diff --git a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index ef68a5ad..01c0d468 100644 --- a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -17,8 +17,12 @@ --> 28px - - 28dp + + + @*android:dimen/status_bar_height_portrait + + + 9dp 530px -- cgit v1.2.3 From 5a63ff26d6356b3a2877ea1ab5c21fe4f12382bb Mon Sep 17 00:00:00 2001 From: shawnlin Date: Wed, 13 Oct 2021 13:03:53 +0800 Subject: Remove resource overlays for system bar heights With the new added APIs, we don't need to overlay status_bar_height that contains cutout size and quick_qs_offset_height anymore. Bug: 186604541 Test: make Change-Id: Idf1ebe47409aa96573af4c303db407625a59627c --- bonito/overlay/frameworks/base/core/res/res/values/dimens.xml | 8 ++++---- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 4 ++-- sargo/overlay/frameworks/base/core/res/res/values/dimens.xml | 6 +++--- .../frameworks/base/packages/SystemUI/res/values/dimens.xml | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml index 0a7c4e5b..80714e93 100644 --- a/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -23,10 +23,10 @@ 38px 39px - - 28dp - - 28dp + + 28dp 3px diff --git a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 8295f934..22291ffb 100644 --- a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -18,8 +18,8 @@ 28px - - @*android:dimen/status_bar_height_portrait + + @*android:dimen/status_bar_height 8.5dp diff --git a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml index 0a7c4e5b..73c38da4 100644 --- a/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/dimens.xml @@ -23,10 +23,10 @@ 38px 39px - + 28dp - - 28dp 3px diff --git a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 01c0d468..c5a50ec3 100644 --- a/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/sargo/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -18,8 +18,8 @@ 28px - - @*android:dimen/status_bar_height_portrait + + @*android:dimen/status_bar_height 9dp -- cgit v1.2.3 From 6a6a1945f74f993c3875fa4af5d37e86b7662405 Mon Sep 17 00:00:00 2001 From: shawnlin Date: Wed, 27 Oct 2021 18:39:12 +0800 Subject: Fix build break Bug: 204287039 Test: make Change-Id: I6bd90b0174e9fe27344466c3ca7d6e2ac430ca4e --- bonito/overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- sargo/overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/bonito/overlay/frameworks/base/core/res/res/values/config.xml b/bonito/overlay/frameworks/base/core/res/res/values/config.xml index 6629dc40..412db9b3 100755 --- a/bonito/overlay/frameworks/base/core/res/res/values/config.xml +++ b/bonito/overlay/frameworks/base/core/res/res/values/config.xml @@ -698,11 +698,6 @@ G020D - - 39px - 38px - 39px - 64 diff --git a/sargo/overlay/frameworks/base/core/res/res/values/config.xml b/sargo/overlay/frameworks/base/core/res/res/values/config.xml index 307435dd..ff067971 100755 --- a/sargo/overlay/frameworks/base/core/res/res/values/config.xml +++ b/sargo/overlay/frameworks/base/core/res/res/values/config.xml @@ -699,11 +699,6 @@ G020H - - 39px - 40px - 41px - 64 -- cgit v1.2.3 From 67d983d5d3871d09b49130ed005816f8b4a3fcdb Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Tue, 16 Nov 2021 07:11:53 +0000 Subject: Update Bonito SVN to 52 Bug: 202436544 Change-Id: I8db361d9daaf71e95c00c20d6752608545f46518 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index bcb9efbf..77b873c5 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=51 + ro.vendor.build.svn=52 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From a4a6625a3e61071ab8441ac080adeffb44cd1719 Mon Sep 17 00:00:00 2001 From: Paul Scovanner Date: Thu, 18 Nov 2021 22:25:17 +0000 Subject: Update Bonito SVN to 53 Bug: 207022948 Change-Id: I5a7dfe8dd55e540a9e11664fe7563bff23a36f7f --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 77b873c5..fed70c63 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=52 + ro.vendor.build.svn=53 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From 4c28cb7c5f23c7e0568ad70113a26479ccc25eb6 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 9 Dec 2021 19:59:23 +0000 Subject: Update Bonito SVN to 54 Bug: 210005927 Change-Id: I302288d780a9b99f334dbc24cedfdf14a9f5d499 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index fed70c63..a13578e9 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=53 + ro.vendor.build.svn=54 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From 4f3d27d60836eb6c0e2684abd8b0860908886da6 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 7 Jan 2022 00:22:57 +0000 Subject: Update Bonito SVN to 55 Bug: 211820647 Change-Id: Ic0fb477acd4bd79c0ee464bf53b5d688f74e4863 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index a13578e9..3cba50d0 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=54 + ro.vendor.build.svn=55 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From a76d04d247d928110a02a527118b0c5bd708dcea Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Sun, 30 Jan 2022 04:34:16 +0000 Subject: Update bonito SVN to 56 Bug: 216579780 Change-Id: Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 (cherry picked from commit b95b719a43f562e8e74ce374eac202f7150f45e6) Merged-In:Ia4661819b2f7ad4cef86d026c97ce07c3be8e005 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index 3cba50d0..f686999a 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=55 + ro.vendor.build.svn=56 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From f5542dd8373e688785298eca1c82ad12a38b50bb Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 26 Jan 2022 00:24:39 +0000 Subject: Migrate the blkio controller to the cgroup v2 hierarchy Remove the statements from init.hardware.rc that refer to /dev/blkio since that path is only valid for the v1 cgroup hierarchy. Move the device settings into task_profiles.json. Bug: 213617178 Test: Untested. Change-Id: Ibb62b2d4d8026ab127edd402b4cfb8070327a568 Signed-off-by: Bart Van Assche --- device.mk | 1 + init.hardware.rc | 7 --- task_profiles.json | 132 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 7 deletions(-) create mode 100644 task_profiles.json diff --git a/device.mk b/device.mk index 3cba50d0..f6380e61 100644 --- a/device.mk +++ b/device.mk @@ -47,6 +47,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/bonito/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \ device/google/bonito/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ + device/google/bonito/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml diff --git a/init.hardware.rc b/init.hardware.rc index ad788c9c..4c3a8416 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -508,13 +508,6 @@ on property:sys.boot_completed=1 write /dev/cpuset/system-background/cpus 2-5 write /dev/cpuset/restricted/cpus 2-5 - # Setup final blkio - # value for group_idle is us - write /dev/blkio/blkio.weight 1000 - write /dev/blkio/background/blkio.weight 200 - write /dev/blkio/blkio.group_idle 2000 - write /dev/blkio/background/blkio.group_idle 0 - # QCOM FG SRAM dump for dumpstate chown system system /d/fg/sram/data chown system system /d/fg/sram/count diff --git a/task_profiles.json b/task_profiles.json new file mode 100644 index 00000000..55657e05 --- /dev/null +++ b/task_profiles.json @@ -0,0 +1,132 @@ +{ + "Profiles": [ + { + "Name": "LowIoPriority", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "BfqWeight", + "Value": "10", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqGroupIdle", + "Value": "0", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqWeight", + "Value": "200", + "IgnoreFailure": "true" + } + } + ] + }, + { + "Name": "NormalIoPriority", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "BfqWeight", + "Value": "100", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqGroupIdle", + "Value": "2000", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqWeight", + "Value": "1000", + "IgnoreFailure": "true" + } + } + ] + }, + { + "Name": "HighIoPriority", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "BfqWeight", + "Value": "100", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqGroupIdle", + "Value": "2000", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqWeight", + "Value": "1000", + "IgnoreFailure": "true" + } + } + ] + }, + { + "Name": "MaxIoPriority", + "Actions": [ + { + "Name": "SetAttribute", + "Params": + { + "Name": "BfqWeight", + "Value": "100", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqGroupIdle", + "Value": "2000", + "IgnoreFailure": "true" + } + }, + { + "Name": "SetAttribute", + "Params": + { + "Name": "CfqWeight", + "Value": "1000", + "IgnoreFailure": "true" + } + } + ] + } + ] +} -- cgit v1.2.3 From bb27750bdfdd67b5c089c3162d6cb424a4574863 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 8 Mar 2022 05:57:20 +0000 Subject: Update bonito SVN to 57 Bug: 223313197 Change-Id: Ic2ed06886679671a04a35f86665cb147b8103905 (cherry picked from commit 2f02dcb4ff3050f1e3af11efa3ed809405e996d8) Merged-In: Ic2ed06886679671a04a35f86665cb147b8103905 --- device.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device.mk b/device.mk index f686999a..3ac623a7 100644 --- a/device.mk +++ b/device.mk @@ -879,7 +879,7 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_PROPERTY_OVERRIDES += \ - ro.vendor.build.svn=56 + ro.vendor.build.svn=57 # Vendor verbose logging default property ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -- cgit v1.2.3 From efee2add8d9280e2316acaa9652d4300bbbd6464 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 30 Mar 2022 14:46:57 +0000 Subject: Revert "Migrate the blkio controller to the cgroup v2 hierarchy" Revert "Migrate the blkio controller to the cgroup v2 hierarchy" Revert submission 1962326-blkio-cgroup-v2 Reason for revert: This set of changes is suspected to have caused a redfin boot time regression for the git_tm-dev branch. Reverted Changes: Id18d876b6:Migrate the blkio controller to the cgroup v2 hier... I7dfa52136:Migrate the blkio controller to the v2 cgroup hier... I5336167be:Migrate the blkio controller to the cgroup v2 hier... I3f0131d8f:Migrate the blkio controller to the cgroup v2 hier... Ibb62b2d4d:Migrate the blkio controller to the cgroup v2 hier... Bug: 227382327 Change-Id: I2a0d8a45c10c00d4880daa8de2a6a2ce2e61134b --- device.mk | 1 - init.hardware.rc | 7 +++ task_profiles.json | 132 ----------------------------------------------------- 3 files changed, 7 insertions(+), 133 deletions(-) delete mode 100644 task_profiles.json diff --git a/device.mk b/device.mk index f6380e61..3cba50d0 100644 --- a/device.mk +++ b/device.mk @@ -47,7 +47,6 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/bonito/default-permissions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default-permissions/default-permissions.xml \ device/google/bonito/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ - device/google/bonito/task_profiles.json:$(TARGET_COPY_OUT_VENDOR)/etc/task_profiles.json \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ frameworks/native/data/etc/android.software.verified_boot.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.verified_boot.xml diff --git a/init.hardware.rc b/init.hardware.rc index 4c3a8416..ad788c9c 100644 --- a/init.hardware.rc +++ b/init.hardware.rc @@ -508,6 +508,13 @@ on property:sys.boot_completed=1 write /dev/cpuset/system-background/cpus 2-5 write /dev/cpuset/restricted/cpus 2-5 + # Setup final blkio + # value for group_idle is us + write /dev/blkio/blkio.weight 1000 + write /dev/blkio/background/blkio.weight 200 + write /dev/blkio/blkio.group_idle 2000 + write /dev/blkio/background/blkio.group_idle 0 + # QCOM FG SRAM dump for dumpstate chown system system /d/fg/sram/data chown system system /d/fg/sram/count diff --git a/task_profiles.json b/task_profiles.json deleted file mode 100644 index 55657e05..00000000 --- a/task_profiles.json +++ /dev/null @@ -1,132 +0,0 @@ -{ - "Profiles": [ - { - "Name": "LowIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "10", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "0", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "200", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "NormalIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "HighIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - }, - { - "Name": "MaxIoPriority", - "Actions": [ - { - "Name": "SetAttribute", - "Params": - { - "Name": "BfqWeight", - "Value": "100", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqGroupIdle", - "Value": "2000", - "IgnoreFailure": "true" - } - }, - { - "Name": "SetAttribute", - "Params": - { - "Name": "CfqWeight", - "Value": "1000", - "IgnoreFailure": "true" - } - } - ] - } - ] -} -- cgit v1.2.3 From a029925a0a9a59d31df94468454aaf462d4a2b4f Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Thu, 31 Mar 2022 14:26:43 -0700 Subject: Non-module target. Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: I45a350d7f3b9e1808140b2e677e0bb15ea37cace --- bonito/AndroidBoard.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bonito/AndroidBoard.mk b/bonito/AndroidBoard.mk index 5ad7cbdf..4a4925e6 100644 --- a/bonito/AndroidBoard.mk +++ b/bonito/AndroidBoard.mk @@ -29,6 +29,9 @@ $(INSTALLED_PERSISTIMAGE_TARGET): $(MKEXTUSERIMG) $(MAKE_EXT4FS) $(INSTALLED_PER $(hide) chmod a+r $@ $(hide) $(call assert-max-image-size,$@,$(BOARD_PERSISTIMAGE_PARTITION_SIZE)) +$(call declare-1p-container,$(INSTALLED_PERSISTIMAGE_TARGET),) +$(call declare-container-license-deps,$(INSTALLED_PERSISTIMAGE_TARGET),$(INSTALLED_PERSISTIMAGE_FILES),$(INSTALLED_PERSISTIMAGE_TARGET):) + ALL_DEFAULT_INSTALLED_MODULES += $(INSTALLED_PERSISTIMAGE_TARGET) ALL_MODULES.$(LOCAL_MODULE).INSTALLED += $(INSTALLED_PERSISTIMAGE_TARGET) INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_PERSISTIMAGE_TARGET) -- cgit v1.2.3 From 98795821d301a0766d2d58bff9894f3ff3ecceac Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Fri, 4 Feb 2022 09:39:22 -0800 Subject: Enable bluetooth profiles with product.prop Bug: 217448211 Test: make -j Merged-In: Ie73064582e562c579c7985c857ccd2ee6ebd095b Change-Id: Ie73064582e562c579c7985c857ccd2ee6ebd095b --- product.prop | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/product.prop b/product.prop index 3c5a053f..5b66058b 100644 --- a/product.prop +++ b/product.prop @@ -89,5 +89,26 @@ persist.bluetooth.bqr.event_mask=14 persist.bluetooth.bqr.min_interval_ms=500 # Bluetooth operating voltage in millivolts bluetooth.hardware.power.operating_voltage_mv=3300 -# Hearing Aid Audio Support Using Bluetooth LE + +# Set supported Bluetooth profiles to enabled bluetooth.profile.asha.central.enabled=true +bluetooth.profile.a2dp.source.enabled=true +bluetooth.profile.avrcp.target.enabled=true +bluetooth.profile.bap.broadcast.assist.enabled=true +bluetooth.profile.bap.unicast.server.enabled=true +bluetooth.profile.bas.client.enabled=true +bluetooth.profile.csip.set_coordinator.enabled=true +bluetooth.profile.gatt.enabled=true +bluetooth.profile.hap.client.enabled=true +bluetooth.profile.hfp.ag.enabled=true +bluetooth.profile.hid.device.enabled=true +bluetooth.profile.hid.host.enabled=true +bluetooth.profile.map.server.enabled=true +bluetooth.profile.mcp.server.enabled=true +bluetooth.profile.opp.enabled=true +bluetooth.profile.pan.nap.enabled=true +bluetooth.profile.pan.panu.enabled=true +bluetooth.profile.pbap.server.enabled=true +bluetooth.profile.sap.server.enabled=true +bluetooth.profile.tbs.server.enabled=true +bluetooth.profile.vc.server.enabled=true -- cgit v1.2.3 From 47008b95382884e8862389fa9d763f0dea6f507c Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 8 Mar 2022 13:53:47 -0800 Subject: Add new notice file build logic BUG: 223289891 Change-Id: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31 Merged-in: I9cadc3074a51d47d3babc6fe63cf91bc79d4bf31 --- self-extractors/qcom/staging/Android.mk | 4 ++++ self-extractors_sargo/qcom/staging/Android.mk | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index 039e9118..a9a36782 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -1,5 +1,9 @@ LOCAL_PATH := $(call my-dir) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,:qcom,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.jar,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.xml,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) + ifneq ($(filter bonito, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) diff --git a/self-extractors_sargo/qcom/staging/Android.mk b/self-extractors_sargo/qcom/staging/Android.mk index ce5244e0..e73075c6 100644 --- a/self-extractors_sargo/qcom/staging/Android.mk +++ b/self-extractors_sargo/qcom/staging/Android.mk @@ -1,5 +1,9 @@ LOCAL_PATH := $(call my-dir) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,:qcom,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.jar,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) +$(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.xml,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) + ifneq ($(filter sargo, $(TARGET_DEVICE)),) include $(CLEAR_VARS) LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX) -- cgit v1.2.3 From bb1c16652690df55d3976f3ca6c5f00c2c72d012 Mon Sep 17 00:00:00 2001 From: Bob Badour Date: Tue, 12 Apr 2022 17:21:19 -0700 Subject: Non-module targets. Bug: 151177513 Bug: 213388645 Bug: 210912771 Test: m droid dist reportmissinglicenses Change-Id: Ia5ee7f8de8e074636f115f5e247f793420f08e5b --- self-extractors/google_devices/staging/Android.mk | 4 ++++ self-extractors/qcom/staging/Android.mk | 2 ++ self-extractors_sargo/google_devices/staging/Android.mk | 4 ++++ self-extractors_sargo/qcom/staging/Android.mk | 2 ++ 4 files changed, 12 insertions(+) diff --git a/self-extractors/google_devices/staging/Android.mk b/self-extractors/google_devices/staging/Android.mk index 339e8009..5caef362 100644 --- a/self-extractors/google_devices/staging/Android.mk +++ b/self-extractors/google_devices/staging/Android.mk @@ -16,7 +16,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + ifneq ($(filter bonito,$(TARGET_DEVICE)),) $(call add-radio-file,bootloader.img) + $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor) $(call add-radio-file,radio.img) + $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor) endif diff --git a/self-extractors/qcom/staging/Android.mk b/self-extractors/qcom/staging/Android.mk index a9a36782..510d07a7 100644 --- a/self-extractors/qcom/staging/Android.mk +++ b/self-extractors/qcom/staging/Android.mk @@ -1,5 +1,7 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + $(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,:qcom,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.jar,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,vendor/qcom/bonito,.xml,legacy_proprietary,proprietary,vendor/qcom/bonito/LICENSE,)) diff --git a/self-extractors_sargo/google_devices/staging/Android.mk b/self-extractors_sargo/google_devices/staging/Android.mk index eeae0715..814ce95d 100644 --- a/self-extractors_sargo/google_devices/staging/Android.mk +++ b/self-extractors_sargo/google_devices/staging/Android.mk @@ -16,7 +16,11 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + ifneq ($(filter sargo,$(TARGET_DEVICE)),) $(call add-radio-file,bootloader.img) + $(call declare-license-metadata,$(LOCAL_PATH)/bootloader.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Bootloader Image",vendor) $(call add-radio-file,radio.img) + $(call declare-license-metadata,$(LOCAL_PATH)/radio.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Radio Image",vendor) endif diff --git a/self-extractors_sargo/qcom/staging/Android.mk b/self-extractors_sargo/qcom/staging/Android.mk index e73075c6..346dc40c 100644 --- a/self-extractors_sargo/qcom/staging/Android.mk +++ b/self-extractors_sargo/qcom/staging/Android.mk @@ -1,5 +1,7 @@ LOCAL_PATH := $(call my-dir) +$(call declare-license-metadata,$(LOCAL_PATH)/vendor.img,legacy_proprietary,proprietary,$(LOCAL_PATH)/../LICENSE,"Vendor Image",vendor) + $(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,:qcom,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.jar,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) $(eval $(call declare-copy-files-license-metadata,vendor/qcom/sargo,.xml,legacy_proprietary,proprietary,vendor/qcom/sargo/LICENSE,)) -- cgit v1.2.3 From 2411804e2ecd7f681eebe470b65f1eef4b8e6deb Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Thu, 7 Apr 2022 15:52:13 -0700 Subject: Update LE Audio profile properties to match spec and implementation Bug: 217448211 Test: atest BluetoothInstrumentationTests Merged-In: Id7cf86161037e805d1e1d50e314f6e40c6207897 Change-Id: Id7cf86161037e805d1e1d50e314f6e40c6207897 --- product.prop | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/product.prop b/product.prop index 5b66058b..0139ccbe 100644 --- a/product.prop +++ b/product.prop @@ -95,7 +95,7 @@ bluetooth.profile.asha.central.enabled=true bluetooth.profile.a2dp.source.enabled=true bluetooth.profile.avrcp.target.enabled=true bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.server.enabled=true +bluetooth.profile.bap.unicast.client.enabled=true bluetooth.profile.bas.client.enabled=true bluetooth.profile.csip.set_coordinator.enabled=true bluetooth.profile.gatt.enabled=true @@ -110,5 +110,5 @@ bluetooth.profile.pan.nap.enabled=true bluetooth.profile.pan.panu.enabled=true bluetooth.profile.pbap.server.enabled=true bluetooth.profile.sap.server.enabled=true -bluetooth.profile.tbs.server.enabled=true -bluetooth.profile.vc.server.enabled=true +bluetooth.profile.ccp.server.enabled=true +bluetooth.profile.vcp.controller.enabled=true -- cgit v1.2.3 From b83708a0aa10c8601f1d2f1ed2dd75b52d97ed32 Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Wed, 27 Apr 2022 13:29:31 -0700 Subject: Use the ?= operator so BT properties can be overridden System properties set with the "=" operator cannot be overriden. This device is used elsewhere in the system and some of the properties need to be overridden. The "?=" operator will use the assigned value if no other values are assigned elsewhere, allowing for overrides. Bug: 230638462 Test: adb shell getprop | grep bluetooth Merged-In: I29701f59e357d5896db5623493010be02dc2b4d5 Change-Id: I29701f59e357d5896db5623493010be02dc2b4d5 --- product.prop | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/product.prop b/product.prop index 0139ccbe..96b7c6cd 100644 --- a/product.prop +++ b/product.prop @@ -91,24 +91,24 @@ persist.bluetooth.bqr.min_interval_ms=500 bluetooth.hardware.power.operating_voltage_mv=3300 # Set supported Bluetooth profiles to enabled -bluetooth.profile.asha.central.enabled=true -bluetooth.profile.a2dp.source.enabled=true -bluetooth.profile.avrcp.target.enabled=true -bluetooth.profile.bap.broadcast.assist.enabled=true -bluetooth.profile.bap.unicast.client.enabled=true -bluetooth.profile.bas.client.enabled=true -bluetooth.profile.csip.set_coordinator.enabled=true -bluetooth.profile.gatt.enabled=true -bluetooth.profile.hap.client.enabled=true -bluetooth.profile.hfp.ag.enabled=true -bluetooth.profile.hid.device.enabled=true -bluetooth.profile.hid.host.enabled=true -bluetooth.profile.map.server.enabled=true -bluetooth.profile.mcp.server.enabled=true -bluetooth.profile.opp.enabled=true -bluetooth.profile.pan.nap.enabled=true -bluetooth.profile.pan.panu.enabled=true -bluetooth.profile.pbap.server.enabled=true -bluetooth.profile.sap.server.enabled=true -bluetooth.profile.ccp.server.enabled=true -bluetooth.profile.vcp.controller.enabled=true +bluetooth.profile.asha.central.enabled?=true +bluetooth.profile.a2dp.source.enabled?=true +bluetooth.profile.avrcp.target.enabled?=true +bluetooth.profile.bap.broadcast.assist.enabled?=true +bluetooth.profile.bap.unicast.client.enabled?=true +bluetooth.profile.bas.client.enabled?=true +bluetooth.profile.csip.set_coordinator.enabled?=true +bluetooth.profile.gatt.enabled?=true +bluetooth.profile.hap.client.enabled?=true +bluetooth.profile.hfp.ag.enabled?=true +bluetooth.profile.hid.device.enabled?=true +bluetooth.profile.hid.host.enabled?=true +bluetooth.profile.map.server.enabled?=true +bluetooth.profile.mcp.server.enabled?=true +bluetooth.profile.opp.enabled?=true +bluetooth.profile.pan.nap.enabled?=true +bluetooth.profile.pan.panu.enabled?=true +bluetooth.profile.pbap.server.enabled?=true +bluetooth.profile.sap.server.enabled?=true +bluetooth.profile.ccp.server.enabled?=true +bluetooth.profile.vcp.controller.enabled?=true -- cgit v1.2.3 From 9def2de92d603165c6b09efaaeb3193269ca2a23 Mon Sep 17 00:00:00 2001 From: Sal Savage Date: Mon, 25 Apr 2022 16:42:02 -0700 Subject: Set default the Bluetooth class of device The class of device is a string with a list of uint8t values: 90,2,12 The meaning is as follows: {Service Field, Major class, Minor class} Service Field: 0x5A -> 90 Bit 17: Networking Bit 19: Capturing Bit 20: Object Transfer Bit 22: Telephony MAJOR_CLASS: 0x02 -> 2 (Phone) MINOR_CLASS: 0x0C -> 12 (Smart Phone) Bug: 217452259 Test: make -j; -- check that bluetooth.device.class_of_device is correct Merged-In: I70301be5e19f2cbc39b626621a62bc529974ca56 Change-Id: I70301be5e19f2cbc39b626621a62bc529974ca56 --- product.prop | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/product.prop b/product.prop index 0139ccbe..1d0970c4 100644 --- a/product.prop +++ b/product.prop @@ -90,6 +90,16 @@ persist.bluetooth.bqr.min_interval_ms=500 # Bluetooth operating voltage in millivolts bluetooth.hardware.power.operating_voltage_mv=3300 +# Set the Bluetooth Class of Device +# Service Field: 0x5A -> 90 +# Bit 17: Networking +# Bit 19: Capturing +# Bit 20: Object Transfer +# Bit 22: Telephony +# MAJOR_CLASS: 0x02 -> 2 (Phone) +# MINOR_CLASS: 0x0C -> 12 (Smart Phone) +bluetooth.device.class_of_device=90,2,12 + # Set supported Bluetooth profiles to enabled bluetooth.profile.asha.central.enabled=true bluetooth.profile.a2dp.source.enabled=true -- cgit v1.2.3 From 4e31cff4d47da6f7e49cd6640b2a516ea42ce32b Mon Sep 17 00:00:00 2001 From: Alice Kuo Date: Fri, 6 May 2022 15:23:15 +0800 Subject: Disable LE audio related profiles for bonito Bug: 231671426 Test: build Change-Id: I5585d3571b1f047b0b4587be91941c315f4340bb --- product.prop | 7 ------- 1 file changed, 7 deletions(-) diff --git a/product.prop b/product.prop index 84793f5e..5f26ad75 100644 --- a/product.prop +++ b/product.prop @@ -104,21 +104,14 @@ bluetooth.device.class_of_device=90,2,12 bluetooth.profile.asha.central.enabled?=true bluetooth.profile.a2dp.source.enabled?=true bluetooth.profile.avrcp.target.enabled?=true -bluetooth.profile.bap.broadcast.assist.enabled?=true -bluetooth.profile.bap.unicast.client.enabled?=true bluetooth.profile.bas.client.enabled?=true -bluetooth.profile.csip.set_coordinator.enabled?=true bluetooth.profile.gatt.enabled?=true -bluetooth.profile.hap.client.enabled?=true bluetooth.profile.hfp.ag.enabled?=true bluetooth.profile.hid.device.enabled?=true bluetooth.profile.hid.host.enabled?=true bluetooth.profile.map.server.enabled?=true -bluetooth.profile.mcp.server.enabled?=true bluetooth.profile.opp.enabled?=true bluetooth.profile.pan.nap.enabled?=true bluetooth.profile.pan.panu.enabled?=true bluetooth.profile.pbap.server.enabled?=true bluetooth.profile.sap.server.enabled?=true -bluetooth.profile.ccp.server.enabled?=true -bluetooth.profile.vcp.controller.enabled?=true -- cgit v1.2.3