Android 15.0.0 Release 6 (AP4A.241205.013)
-----BEGIN PGP SIGNATURE----- iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO eCMSAJ95Nymz4O8Ns1Qme+Oncb7Gdsw8ZQCgjiQ4o4/XgQKsvMhu4CkNmJsyXl8= =IOWw -----END PGP SIGNATURE----- gpgsig -----BEGIN PGP SIGNATURE----- iQJLBAABCgA1FiEEHrBYPudH862glXQBzJUERRm+ZmkFAmdY7msXHG1rYmVzdGFz QGxpbmVhZ2Vvcy5vcmcACgkQzJUERRm+ZmkRWhAAutEXt5UqQlI72nkMLAEz9IX2 RG7M4H6FFmnoKQ9JRxzosrllYpX4MgQInO09QBBFkX6cmAdO1/TtIlDpHa8M7w8D KTp/bcIVeDr+BzoqUWv3/yf11FSKN6PeNU64mIxKCj7OtQ0ujVRHZimlzCA4hWVU lZrcUnYDwRu5xb5fgsQGuK3rsonH0GiKwvuEbnPJh1wFwtCdrLQR39hSPU3Dg3om UKEGUBk0SN0bAtMarjRqjwABZR/wcD/BzmeR0Y2tdAm+r/mnBTesbF9PKIUudRzm qEBaIdL5SA4TQ9RqFufhPzkd5b12iYd8UQwEkLlIAYtuOVjUVgVajCse7Lp1Us1x Ldadcg+OEMrJXnp2W0jBi+J4AzL/m2cR++bkfka7B2DQxfsC763b/bylVT4Vu3Q9 vni9BFGZqvUekbItjS2/6Apbs7i0i7cDlRSLNAb1DCDW68mbhiY3RvboqooP8nGB oqgbvZqDL0lB6j3NagyB2pkFgPo2OvkCEOqIplkRq3Y2ZlaPgRPkIPhbQwE/LkMo r5pU5VYRsgLneo2CIxARAJARJlFlkaFXn1Ccw2wEzAeNO7WV2aVTMMTW+NgMt9zm 49Z6msmEXG0S4jxU+TXvRR5XSlTGDTzudICzSutHWWCADTyn0IHl7yrEc4RoTN75 U+KlNzIlop42k34B0kw= =+IPt -----END PGP SIGNATURE----- Merge tag 'android-15.0.0_r6' into staging/lineage-22.0_merge-android-15.0.0_r6 Android 15.0.0 Release 6 (AP4A.241205.013) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZ1IssQAKCRDorT+BmrEO # eCMSAJ95Nymz4O8Ns1Qme+Oncb7Gdsw8ZQCgjiQ4o4/XgQKsvMhu4CkNmJsyXl8= # =IOWw # -----END PGP SIGNATURE----- # gpg: Signature made Fri Dec 6 00:44:01 2024 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2483 signatures in the past # 3 years. Encrypted 4 messages in the past 2 years. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Per Åhgren (9) and others # Via Android (Google) Code Review (78) and others * tag 'android-15.0.0_r6': (111 commits) gps: Update official release 4.15.3_7_241024_R1 config on P24 powerhint: enable auto_prefer_idle in games caimito: fix unexpected affinity setting. Add Sony WF-1000XM5 to the LE audio allow list tokay: Update APMg3 tuning files caiman: Update APMg3 tuning files komodo: Update APMg3 tuning files bthal: disable thread dispatcher gps: Update L5 Path Delay Parameters for P24 komodo: Update APMg3 tuning files caiman: Update APMg3 tuning files tokay: Update APMg3 tuning files caimito: fix bypass mode creation flow Revert^2 "Move PRODUCT_SHIPPING_API_LEVEL to define by device" 16kb: Set data partition to f2fs for 16kb aosp caimito targets only gps: Update official release 4.15.3_6_240905_R2 config thread: disable hal service gps: Remove ENABLE_CAPS_OTDOA to enable OTDOA in VZW network. Update product id for Caiman, Komodo and Tokay Symlink current prebuilt folder to android root ... Conflicts: device-caiman.mk device-komodo.mk device-tokay.mk Change-Id: I590408c74ef4bcc68613966602af3cb781eb702d
This commit is contained in:
Michael Bestas
commit
4d41715293
178 changed files with 10203 additions and 764 deletions
|
|
@ -20,10 +20,15 @@ TARGET_SCREEN_DENSITY := 480
|
|||
BOARD_USES_GENERIC_AUDIO := true
|
||||
USES_DEVICE_GOOGLE_CAIMITO := true
|
||||
|
||||
RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR)
|
||||
RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR)
|
||||
RELEASE_GOOGLE_PRODUCT_NTNRADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_NTNRADIO_DIR)
|
||||
|
||||
include device/google/caimito/device-caimito-common.mk
|
||||
|
||||
include device/google/zumapro/BoardConfig-common.mk
|
||||
-include vendor/google_devices/zumapro/prebuilts/BoardConfigVendor.mk
|
||||
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
|
||||
-include vendor/google_devices/caiman/proprietary/BoardConfigVendor.mk
|
||||
include device/google/caimito/sepolicy/caiman-sepolicy.mk
|
||||
include device/google/caimito/wifi/BoardConfig-wifi.mk
|
||||
|
|
|
|||
|
|
@ -54,6 +54,10 @@
|
|||
<!-- 140 nits: (140-2)/(1250-2)*(0.61-0.0)+0.0 = 0.067451923 -->
|
||||
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.067451923</item>
|
||||
|
||||
<!-- The maximum range of gamma adjustment possible using the screen
|
||||
auto-brightness adjustment setting. -->
|
||||
<fraction name="config_autoBrightnessAdjustmentMaxGamma">105%</fraction>
|
||||
|
||||
<!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
|
||||
this value to 0 so it has no effect. -->
|
||||
<integer name="config_defaultRefreshRate">0</integer>
|
||||
|
|
@ -173,9 +177,12 @@
|
|||
<!-- The max vibration strength allowed in audio haptic channels. -->
|
||||
<item name="config_hapticChannelMaxVibrationAmplitude" format="float" type="dimen">0.335</item>
|
||||
|
||||
<dimen name="status_bar_height_default">52dp</dimen>
|
||||
<dimen name="status_bar_height_portrait">52dp</dimen>
|
||||
<dimen name="status_bar_height_landscape">52dp</dimen>
|
||||
<!-- Align to camera cutout's height. -->
|
||||
<dimen name="status_bar_height_portrait">68dp</dimen>
|
||||
<!-- Since @dimen/status_bar_height_portrait is modified in overlay, need to restore its value
|
||||
from original folder. This should be done even looks no effect on some apps because
|
||||
some other apps may reference to it. -->
|
||||
<dimen name="status_bar_height_landscape">24dp</dimen>
|
||||
|
||||
<!-- Whether the display cutout region of the main built-in display should be forced to
|
||||
black in software (to avoid aliasing or emulate a cutout that is not physically existent).
|
||||
|
|
@ -187,8 +194,10 @@
|
|||
@left
|
||||
</string>
|
||||
|
||||
<!-- This configuartion effects status bar's height actually. Set its height as double
|
||||
y position of @dimen/config_mainBuiltInDisplayCutout to make cutout center vertically -->
|
||||
<string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
|
||||
m 586,0 h 108.5 v 155.5 H 586 Z
|
||||
m 586,0 h 108.5 v 204 H 586 Z
|
||||
@left
|
||||
</string>
|
||||
<!-- A string config in svg path format for the main display shape.
|
||||
|
|
|
|||
|
|
@ -184,11 +184,11 @@
|
|||
</array>
|
||||
<item name="gps.voltage">3700</item>
|
||||
<!-- Idle Receive current for wifi radio in mA.-->
|
||||
<item name="wifi.controller.idle">79</item>
|
||||
<item name="wifi.controller.idle">31</item>
|
||||
<!-- Rx current for wifi radio in mA.-->
|
||||
<item name="wifi.controller.rx">118</item>
|
||||
<item name="wifi.controller.rx">39</item>
|
||||
<!-- Tx current for wifi radio in mA-->
|
||||
<item name="wifi.controller.tx">331</item>
|
||||
<item name="wifi.controller.tx">540</item>
|
||||
<!-- Operating voltage for wifi radio in mV.-->
|
||||
<item name="wifi.controller.voltage">3700</item>
|
||||
<item name="wifi.controller.voltage">3850</item>
|
||||
</device>
|
||||
|
|
|
|||
|
|
@ -39,16 +39,6 @@
|
|||
always-on display) -->
|
||||
<string name="doze_brightness_sensor_type" translatable="false">com.google.sensor.binned_brightness</string>
|
||||
|
||||
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
|
||||
to brightness values; -1 means keeping the current brightness. -->
|
||||
<integer-array name="config_doze_brightness_sensor_to_brightness">
|
||||
<item>-1</item> <!-- 0: OFF -->
|
||||
<item>1</item> <!-- 1: NIGHT (1-1)/(255-1)*(2050-2)+2 = 2 nits -->
|
||||
<item>2</item> <!-- 2: LOW (2-1)/(255-1)*(2050-2)+2 = 10.1 nits -->
|
||||
<item>7</item> <!-- 3: HIGH (7-1)/(255-1)*(2050-2)+2 = 50.4 nits -->
|
||||
<item>7</item> <!-- 4: SUN -->
|
||||
</integer-array>
|
||||
|
||||
<!-- Doze: Table that translates sensor values from the doze_brightness_sensor_type sensor
|
||||
to an opacity value for a black scrim that is overlaid in AOD1.
|
||||
Valid range is from 0 (transparent) to 255 (opaque).
|
||||
|
|
|
|||
|
|
@ -31,6 +31,6 @@
|
|||
<item>36</item>
|
||||
</integer-array>
|
||||
<integer-array name="antenna_y">
|
||||
<item>108</item>
|
||||
<item>44</item>
|
||||
</integer-array>
|
||||
</resources>
|
||||
|
|
|
|||
18
caiman/rro_overlays/UwbOverlay/Android.bp
Normal file
18
caiman/rro_overlays/UwbOverlay/Android.bp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
package {
|
||||
// See: http://go/android-license-faq
|
||||
// A large-scale-change added 'default_applicable_licenses' to import
|
||||
// all of the 'license_kinds' from "//device/google/caimito:device_google_caimito_license"
|
||||
// to get the below license kinds:
|
||||
// SPDX-license-identifier-Apache-2.0
|
||||
default_applicable_licenses: [
|
||||
"//device/google/caimito:device_google_caimito_license",
|
||||
],
|
||||
}
|
||||
|
||||
runtime_resource_overlay {
|
||||
name: "UwbOverlayCM4",
|
||||
theme: "UwbOverlayCM4",
|
||||
certificate: "platform",
|
||||
sdk_version: "current",
|
||||
product_specific: true,
|
||||
}
|
||||
27
caiman/rro_overlays/UwbOverlay/AndroidManifest.xml
Normal file
27
caiman/rro_overlays/UwbOverlay/AndroidManifest.xml
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (C) 2024 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.
|
||||
-->
|
||||
<!-- Pixel specific uwb overlays -->
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.android.uwb.resources.pixel"
|
||||
android:versionCode="1"
|
||||
android:versionName="1.0">
|
||||
<application android:hasCode="false" />
|
||||
<overlay
|
||||
android:targetPackage="com.android.uwb.resources"
|
||||
android:targetName="UwbCustomization"
|
||||
android:isStatic="true"
|
||||
android:priority="0"/>
|
||||
</manifest>
|
||||
3
caiman/rro_overlays/UwbOverlay/OWNERS
Normal file
3
caiman/rro_overlays/UwbOverlay/OWNERS
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# People who can approve changes for submission
|
||||
include platform/packages/modules/Uwb:/OWNERS
|
||||
victorliu@google.com
|
||||
41
caiman/rro_overlays/UwbOverlay/res/values/config.xml
Normal file
41
caiman/rro_overlays/UwbOverlay/res/values/config.xml
Normal file
|
|
@ -0,0 +1,41 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
/*
|
||||
* Copyright (C) 2024 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.
|
||||
*/
|
||||
-->
|
||||
<resources>
|
||||
<!-- When true, the filter engine will alter UWB values to improve accuracy. -->
|
||||
<bool name="enable_filters">true</bool>
|
||||
|
||||
<!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
|
||||
to spherical coordinates, including hardware that does not support elevation.-->
|
||||
<bool name="enable_primer_aoa">true</bool>
|
||||
|
||||
<!-- Whether background ranging is enabled or not
|
||||
If enabled:
|
||||
* Background 3p apps are allowed to open new ranging sessions
|
||||
* When previously foreground 3p apps moves to background, sessions are not terminated
|
||||
-->
|
||||
<bool name = "background_ranging_enabled">true</bool>
|
||||
|
||||
<!-- Whether multicast list update notification v2 is supported or not.
|
||||
If enabled, the notification will be parsed into version 2 if uci major version is 2.0. -->
|
||||
<bool name = "is_multicast_list_update_ntf_v2_supported">true</bool>
|
||||
|
||||
<!-- Whether multicast list update response v2 is supported or not.
|
||||
If enabled, the response will be parsed into version 2 if uci major version is 2.0. -->
|
||||
<bool name = "is_multicast_list_update_rsp_v2_supported">true</bool>
|
||||
</resources>
|
||||
|
|
@ -69,3 +69,9 @@ prebuilt_etc {
|
|||
defaults: ["conf_defaults"],
|
||||
}
|
||||
|
||||
prebuilt_etc {
|
||||
name: "capabilities.conf",
|
||||
src: "capabilities.conf",
|
||||
defaults: ["conf_defaults"],
|
||||
}
|
||||
|
||||
|
|
|
|||
8
caiman/uwb/capabilities.conf
Normal file
8
caiman/uwb/capabilities.conf
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# Tag 0x13
|
||||
# Length 1
|
||||
# b0 : Azimuth AoA -90° to 90°
|
||||
# b1 : Azimuth AoA -180° to 180°
|
||||
# b2 : Elevation AoA
|
||||
# b3 : AoA FoM
|
||||
# b7-b4 : RFU
|
||||
AOA_SUPPORT=0x0B
|
||||
|
|
@ -21,4 +21,5 @@ PRODUCT_PACKAGES += \
|
|||
calibration-FCC.conf \
|
||||
calibration-JP.conf \
|
||||
calibration-TW.conf \
|
||||
calibration-RESTRICTED.conf
|
||||
calibration-RESTRICTED.conf \
|
||||
capabilities.conf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue