berlin: T1RGS33M.135-109-9-1

Change-Id: If67b0702a1ce10c3d51949fdbec19ca2b707f557

.gitattributes

@@ -1,2 +1,3 @@
 radio/* filter=lfs diff=lfs merge=lfs -text
 proprietary/product/priv-app/MotCamera3/MotCamera3.apk filter=lfs diff=lfs merge=lfs -text
+proprietary/product/priv-app/MotCamera4/MotCamera4.apk filter=lfs diff=lfs merge=lfs -text

Android.bp

@@ -27,9 +27,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "HotwordEnrollmentOKGoogleHEXAGON",
+	name: "HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND",
 	owner: "motorola",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON/HotwordEnrollmentOKGoogleHEXAGON.apk",
+	apk: "proprietary/product/priv-app/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND/HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -39,9 +39,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "HotwordEnrollmentXGoogleHEXAGON",
+	name: "HotwordEnrollmentXGoogleHEXAGON_WIDEBAND",
 	owner: "motorola",
-	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON/HotwordEnrollmentXGoogleHEXAGON.apk",
+	apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND/HotwordEnrollmentXGoogleHEXAGON_WIDEBAND.apk",
 	certificate: "platform",
 	dex_preopt: {
 		enabled: false,
@@ -51,9 +51,9 @@ android_app_import {
 }
 
 android_app_import {
-	name: "MotCamera3",
+	name: "MotCamera4",
 	owner: "motorola",
-	apk: "proprietary/product/priv-app/MotCamera3/MotCamera3.apk",
+	apk: "proprietary/product/priv-app/MotCamera4/MotCamera4.apk",
 	overrides: ["Aperture"],
 	presigned: true,
 	dex_preopt: {
@@ -100,10 +100,3 @@ dex_import {
 	system_ext_specific: true,
 }
 
-dex_import {
-	name: "com.motorola.androidx.camera.extensions",
-	owner: "motorola",
-	jars: ["proprietary/system_ext/framework/com.motorola.androidx.camera.extensions.jar"],
-	system_ext_specific: true,
-}
-

berlin-vendor.mk

@@ -22,11 +22,6 @@ PRODUCT_COPY_FILES += \
     vendor/motorola/berlin/proprietary/system/etc/permissions/moto-settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/moto-settings.xml \
     vendor/motorola/berlin/proprietary/system_ext/bin/motsettings:$(TARGET_COPY_OUT_SYSTEM_EXT)/bin/motsettings \
     vendor/motorola/berlin/proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.android.hotwordenrollment.common.util.xml \
-    vendor/motorola/berlin/proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/com.motorola.androidx.camera.extensions.xml \
-    vendor/motorola/berlin/proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.motorola.androidx.camera.extensions.xml \
-    vendor/motorola/berlin/proprietary/system_ext/etc/public.libraries-motocamera.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-motocamera.txt \
-    vendor/motorola/berlin/proprietary/system_ext/lib/libmcf_native_window_helper.motocamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib/libmcf_native_window_helper.motocamera.so \
-    vendor/motorola/berlin/proprietary/system_ext/lib64/libmcf_native_window_helper.motocamera.so:$(TARGET_COPY_OUT_SYSTEM_EXT)/lib64/libmcf_native_window_helper.motocamera.so \
     vendor/motorola/berlin/proprietary/vendor/bin/STFlashTool:$(TARGET_COPY_OUT_VENDOR)/bin/STFlashTool \
     vendor/motorola/berlin/proprietary/vendor/bin/hw/motorola.hardware.camera.desktop@2.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/motorola.hardware.camera.desktop@2.0-service \
     vendor/motorola/berlin/proprietary/vendor/etc/acdbdata/Bluetooth_cal.acdb:$(TARGET_COPY_OUT_VENDOR)/etc/acdbdata/Bluetooth_cal.acdb \
@@ -643,12 +638,11 @@ PRODUCT_COPY_FILES += \
 PRODUCT_PACKAGES += \
     MotoSignatureApp \
     MotCamera3AI \
-    HotwordEnrollmentOKGoogleHEXAGON \
+    HotwordEnrollmentOKGoogleHEXAGON_WIDEBAND \
-    HotwordEnrollmentXGoogleHEXAGON \
+    HotwordEnrollmentXGoogleHEXAGON_WIDEBAND \
-    MotCamera3 \
+    MotCamera4 \
     MotorolaSettingsProvider \
     com.motorola.motosignature \
     moto-core_services \
     moto-settings \
-    com.android.hotwordenrollment.common.util \
+    com.android.hotwordenrollment.common.util
-    com.motorola.androidx.camera.extensions

proprietary/system/etc/permissions/moto-core_services.xml

@@ -14,6 +14,9 @@
     limitations under the License.
 -->
 <permissions>
-    <library name="moto-core_services" file="/system/framework/moto-core_services.jar"/>
+    <library
+        name="moto-core_services"
+        file="/system/framework/moto-core_services.jar"
+    />
 </permissions>
 

proprietary/system/etc/permissions/moto-settings.xml

@@ -14,6 +14,9 @@
     limitations under the License.
 -->
 <permissions>
-    <library name="moto-settings" file="/system/framework/moto-settings.jar"/>
+    <library
+        name="moto-settings"
+        file="/system/framework/moto-settings.jar"
+    />
 </permissions>
 

proprietary/system_ext/etc/permissions/com.android.hotwordenrollment.common.util.xml

@@ -14,6 +14,9 @@
     limitations under the License.
 -->
 <permissions>
-    <library name="com.android.hotwordenrollment.common.util" file="/system_ext/framework/com.android.hotwordenrollment.common.util.jar"/>
+    <library
+        name="com.android.hotwordenrollment.common.util"
+        file="/system_ext/framework/com.android.hotwordenrollment.common.util.jar"
+    />
 </permissions>
 

proprietary/system_ext/etc/permissions/com.motorola.androidx.camera.extensions.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="androidx.camera.extensions.impl"
-             file="/system_ext/framework/com.motorola.androidx.camera.extensions.jar" />
-</permissions>

proprietary/system_ext/etc/public.libraries-motocamera.txt

@@ -1 +0,0 @@
-libmcf_native_window_helper.motocamera.so

proprietary/vendor/etc/libnfc-mtp-SN100.conf

@@ -1,6 +1,6 @@
 #################### This file is used by NXP NFC NCI HAL #####################
 ## Modified by Motorola Mobility LLC
-## Version : Cypfr.3 (2021/12/10)
+## Version : Cypfr.4 (2021/06/09)
 ###############################################################################
 # Application options
 # Logging Levels
@@ -769,8 +769,12 @@ NXP_GET_HW_INFO_LOG=0x00
 #################################################################################
 # Valid time difference range within for non-standard tag detection from first
 # Activation fail to next discovery
-# Note :- This will take effect only when NXP_SUPPORT_NON_STD_CARD is enabled
+# Note :- 1. This will take effect only when NXP_SUPPORT_NON_STD_CARD is enabled
-# Default         100 ms
+#         2. The number will be multiplied by 100ms by MW.
-NXP_NON_STD_CARD_TIMEDIFF=100
+# Default:
+# Set to 00 if not supported
+#  byte[0] MIFARE_CLASSIC 100ms
+#  byte[1] ISO_DEP        300ms
+NXP_NON_STD_CARD_TIMEDIFF={01, 03}
 #################################################################################
 

proprietary/vendor/etc/libnfc-mtp-SN100_38_4MHZ.conf

@@ -1,6 +1,6 @@
 #################### This file is used by NXP NFC NCI HAL #####################
 ## Modified by Motorola Mobility LLC
-## Version : Cypfr.3 (2021/12/10)
+## Version : Cypfr.4 (2021/06/09)
 ###############################################################################
 # Application options
 # Logging Levels
@@ -769,8 +769,12 @@ NXP_GET_HW_INFO_LOG=0x00
 #################################################################################
 # Valid time difference range within for non-standard tag detection from first
 # Activation fail to next discovery
-# Note :- This will take effect only when NXP_SUPPORT_NON_STD_CARD is enabled
+# Note :- 1. This will take effect only when NXP_SUPPORT_NON_STD_CARD is enabled
-# Default         100 ms
+#         2. The number will be multiplied by 100ms by MW.
-NXP_NON_STD_CARD_TIMEDIFF=100
+# Default:
+# Set to 00 if not supported
+#  byte[0] MIFARE_CLASSIC 100ms
+#  byte[1] ISO_DEP        300ms
+NXP_NON_STD_CARD_TIMEDIFF={01, 03}
 #################################################################################
 

proprietary/vendor/etc/permissions/com.motorola.androidx.camera.extensions.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <library name="androidx.camera.extensions.impl"
-             file="/system_ext/framework/com.motorola.androidx.camera.extensions.jar" />
-</permissions>

proprietary/vendor/etc/sensors/proto/mot_tap.proto

@@ -41,4 +41,5 @@ message mot_tap_event
   required float period = 3;
   required float conf = 4;
   optional float angle = 5;
+  optional float magnitude = 6;
 }

proprietary/vendor/etc/sensors/proto/sns_formatter.proto

@@ -1,8 +1,8 @@
-// @file sns_offset_formatter.proto
+// @file sns_formatter.proto
 //
 // Defines standard message types for the Offset/Formatter sensor
 //
-// Copyright (c) 2018 Qualcomm Technologies, Inc.
+// Copyright (c) 2018, 2020, 2022 Qualcomm Technologies, Inc.
 // All Rights Reserved.
 // Confidential and Proprietary - Qualcomm Technologies, Inc.
 syntax = "proto2";
@@ -15,9 +15,12 @@ enum sns_formatter_msgid {
 
   SNS_FORMATTER_MSGID_SNS_FORMATTER_REQUEST                = 512;
   SNS_FORMATTER_MSGID_SNS_FORMATTER_METRIC_DATA_REQUEST    = 513;
+  SNS_FORMATTER_MSGID_SNS_FORMATTER_BROADCAST_DATA_REQUEST = 514;
 
   SNS_FORMATTER_MSGID_SNS_FORMATTER_OUTPUT_EVENT           = 1024;
   SNS_FORMATTER_MSGID_SNS_FORMATTER_ACK_EVENT              = 1025;
+  SNS_FORMATTER_MSGID_SNS_FORMATTER_OUTPUT_GOAL_EVENT      = 1026;
+  SNS_FORMATTER_MSGID_SNS_FORMATTER_OUTPUT_THRESHOLD_EVENT = 1027;
  }
 
 enum sns_formatter_request_values {
@@ -28,7 +31,7 @@ enum sns_formatter_request_values {
   SNS_FORMATTER_REQUEST_CREATE   = 1;
   // Starts or resumes the update of the metric instances.
   SNS_FORMATTER_REQUEST_START    = 2;
-  // Pauses the update of the metric instances.
+  // Stops the update of the metric instances.
   SNS_FORMATTER_REQUEST_STOP     = 3;
   // Resets metric instance state.
   SNS_FORMATTER_REQUEST_RESET    = 4;
@@ -40,6 +43,8 @@ enum sns_formatter_request_values {
   SNS_FORMATTER_REQUEST_CONFIG_GET   = 7;
   // Updates the batch period at the client manager.
   SNS_FORMATTER_REQUEST_BATCH        = 8;
+  // Pauses the update of the metric instances
+  SNS_FORMATTER_REQUEST_PAUSE     = 9;
 }
 
 enum sns_formatter_status_values {
@@ -101,6 +106,11 @@ message sns_formatter_metric_data_request
   required bytes       metric_data  = 2;
 }
 
+message sns_formatter_broadcast_data_request
+{
+  required bytes broadcast_data = 1;
+}
+
 // Formatter output event
 // This event contains the formatted string output corresponding to the
 // metric requested by the client.
@@ -111,6 +121,40 @@ message sns_formatter_output_event
   required sns_formatter_output_event_payload  event_payload     = 3;
 }
 
+enum sns_formatter_goal_type
+{
+  option (nanopb_enumopt).long_names = false;
+
+  SNS_FORMATTER_GOAL_VALUE   = 1;
+  SNS_FORMATTER_GOAL_DURATION = 2;
+}
+
+
+message sns_formatter_output_goal_event
+{
+  required fixed32                      metric_id         = 1;
+  required sns_formatter_goal_type      goal_type         = 2;
+  oneof goal_data
+  {
+     fixed32 int_data   =3;     // Data can be goal value or duration. Goal_type is used to identify type of data.
+     float   float_data   =4;    // This is for goal value of float type. Ex: Algos like distance may set float values
+  }
+}
+
+enum sns_formatter_threshold_type
+{
+  option (nanopb_enumopt).long_names = false;
+
+  SNS_FORMATTER_HIGH_THRESHOLD_ACHIEVED =1;
+  SNS_FORMATTER_LOW_THRESHOLD_ACHIEVED=2;
+}
+
+message sns_formatter_output_threshold_event
+{
+  required fixed32                         metric_id         = 1;
+  required sns_formatter_threshold_type    th_type           = 2;
+}
+
 // Formatter acknowledge event
 // This event contains the status for the request sent from the client.
 // Status indicates if the requested format string was valid or not.

proprietary/vendor/etc/vhw.xml

@@ -871,7 +871,7 @@
 		</mappings>
 	</device>
 
-	<device name="tundra" version="0.1">
+	<device name="tundra" version="0.5">
 
 		<!-- Features list variable hardware components for this device -->
 		<features>
@@ -943,6 +943,7 @@
 			<string-array name="storage/.range">
 				<item>128GB</item>
 				<item>256GB</item>
+				<item>512GB</item>
 			</string-array>
 
 			<string name="dualsim/.auto">default=true</string>
@@ -955,8 +956,7 @@
 			<!-- frontcolor has to be programmed explicitly -->
 			<string name="frontcolor/.system">ro.vendor.hw.</string>
 			<string-array name="frontcolor/.range">
-				<item>MIRAGE</item>
+				<item>barberry</item>
-				<item>SEA ICE</item>
 				<item>other</item>
 			</string-array>
 
@@ -975,11 +975,13 @@
 				<item>true</item>
 			</string-array>
 
-			<string name="nfc/.auto">default=ese_nq</string>
+			<string name="nfc/.auto">key=hwid;index=2;map=1:nq,2:ese_nq</string>
 			<string name="nfc/.chosen">mmi,</string>
 			<string name="nfc/.system">ro.vendor.hw.</string>
 			<string-array name="nfc/.range">
 				<item>ese_nq</item>
+				<item>nq</item>
+				<item>false</item>
 			</string-array>
 
 			<string name="displayport/.auto">default=true</string>
@@ -1005,9 +1007,19 @@
 				<!-- ... same format as variants/products ... -->
 				<variant name="dn">
 					<string name="dualsim">true</string>
+					<string name="nfc">nq</string>
 				</variant>
 				<variant name="n">
 					<string name="dualsim">false</string>
+					<string name="nfc">nq</string>
+				</variant>
+				<variant name="de">
+					<string name="dualsim">true</string>
+					<string name="nfc">ese_nq</string>
+				</variant>
+				<variant name="e">
+					<string name="dualsim">false</string>
+					<string name="nfc">ese_nq</string>
 				</variant>
 			</skus>