Snap for 8554636 from 4e31cff4d47da6f7e49cd6640b2a516ea42ce32b to sdk-releaseplatform-tools-33.0.2sdk-release

Change-Id: I0b74668b2c0c045a7eb6e1033580838625f0a61f

14 files changed, 67 insertions, 18 deletions

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)
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 66fddfc1..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,4 +698,6 @@
         <item>G020D</item>
     </string-array>
 
+    <!-- the number of the max cached processes in the system. -->
+    <integer name="config_customizedMaxCachedProcesses">64</integer>
 </resources>
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 @@
     <dimen name="rounded_corner_radius_top">38px</dimen>
     <dimen name="rounded_corner_radius_bottom">39px</dimen>
 
-    <!-- Height of the status bar -->
-    <dimen name="status_bar_height_portrait">28dp</dimen>
-    <!-- Height of area above QQS where battery/time go (equal to status bar) -->
-    <dimen name="quick_qs_offset_height">28dp</dimen>
+    <!-- Height of the status bar.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
+    <dimen name="status_bar_height">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">3px</dimen>
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..2668ad30 100644
--- a/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/bonito/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -18,11 +18,11 @@
 <resources>
     <dimen name="rounded_corner_content_padding">28px</dimen>
 
-    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
-    <dimen name="system_icons_keyguard_padding_end">8.5dp</dimen>
+    <dimen name="system_icons_keyguard_padding_end">8dp</dimen>
 
     <!-- Location on the screen of the center of the physical power button. -->
     <dimen name="physical_power_button_center_screen_location_y">500px</dimen>
diff --git a/device.mk b/device.mk
index a13578e9..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=54
+	ro.vendor.build.svn=57
 
 # Vendor verbose logging default property
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
index 103b238d..7e9d21d0 100644
--- a/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
+++ b/overlay/frameworks/base/packages/SystemUI/res/values/config.xml
@@ -43,7 +43,4 @@
 
     <!-- Doze: whether the double tap sensor reports 2D touch coordinates -->
     <bool name="doze_double_tap_reports_touch_coordinates">true</bool>
-
-    <!-- Whether global actions should show an informational message about changes in S -->
-    <bool name="global_actions_show_change_info">true</bool>
 </resources>
diff --git a/product.prop b/product.prop
index 3c5a053f..5f26ad75 100644
--- a/product.prop
+++ b/product.prop
@@ -89,5 +89,29 @@ 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
-bluetooth.profile.asha.central.enabled=true
+
+# 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
+bluetooth.profile.avrcp.target.enabled?=true
+bluetooth.profile.bas.client.enabled?=true
+bluetooth.profile.gatt.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.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
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 5c67555c..ff067971 100755
--- a/sargo/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/sargo/overlay/frameworks/base/core/res/res/values/config.xml
@@ -698,4 +698,7 @@
     <string-array name="config_disableApkUnlessMatchedSku_skus_list" translatable="false">
         <item>G020H</item>
     </string-array>
+
+    <!-- the number of the max cached processes in the system. -->
+    <integer name="config_customizedMaxCachedProcesses">64</integer>
 </resources>
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 @@
     <dimen name="rounded_corner_radius_top">38px</dimen>
     <dimen name="rounded_corner_radius_bottom">39px</dimen>
 
-    <!-- Height of the status bar -->
+    <!-- Height of the status bar.
+         Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
+         -->
     <dimen name="status_bar_height_portrait">28dp</dimen>
-    <!-- Height of area above QQS where battery/time go (equal to status bar) -->
-    <dimen name="quick_qs_offset_height">28dp</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">3px</dimen>
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 @@
 <resources>
     <dimen name="rounded_corner_content_padding">28px</dimen>
 
-    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_height) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
     <dimen name="system_icons_keyguard_padding_end">9dp</dimen>
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 039e9118..510d07a7 100644
--- a/self-extractors/qcom/staging/Android.mk
+++ b/self-extractors/qcom/staging/Android.mk
@@ -1,5 +1,11 @@
 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,))
+
 ifneq ($(filter bonito, $(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)
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 ce5244e0..346dc40c 100644
--- a/self-extractors_sargo/qcom/staging/Android.mk
+++ b/self-extractors_sargo/qcom/staging/Android.mk
@@ -1,5 +1,11 @@
 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,))
+
 ifneq ($(filter sargo, $(TARGET_DEVICE)),)
 include $(CLEAR_VARS)
 LOCAL_MODULE_SUFFIX := $(COMMON_ANDROID_PACKAGE_SUFFIX)