Snap for 11041982 from 0f692bf8ddee7fa59ef6abea1e39db819f6c4650 to mainline-uwb-releaseaml_uwb_341310300aml_uwb_341310030android14-mainline-uwb-release

Change-Id: I4b90edb3742d175cb49ac0b7bb876612a4527d56

6 files changed, 13 insertions, 13 deletions

diff --git a/car-lib/Android.mk b/car-lib/Android.mk
index 4ae1e3a186..daeaad0391 100644
--- a/car-lib/Android.mk
+++ b/car-lib/Android.mk
@@ -31,7 +31,7 @@ car_api_xmls := $(addprefix $(TARGET_OUT_COMMON_INTERMEDIATES)/,car-api.xml car-
 $(car_api_xmls): $(TARGET_OUT_COMMON_INTERMEDIATES)/car-%api.xml : packages/services/Car/car-lib/api/%current.txt $(APICHECK)
 	$(hide) echo "Converting API file to XML: $@"
 	$(hide) mkdir -p $(dir $@)
-	$(hide) $(APICHECK_COMMAND) -convert2xml $< $@
+	$(hide) $(APICHECK_COMMAND) signature-to-jdiff --strip $< $@
 
 $(call dist-for-goals, dist_files, $(car_api_xmls))
 car_api_xmls :=
diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index 8cc3aa2e59..84ae9daa78 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/strings.xml
@@ -57,7 +57,7 @@
     <string name="car_permission_car_display_in_cluster" msgid="4005987646292458684">"Zuzeneko errendatzea instrumentu lukuan"</string>
     <string name="car_permission_desc_car_display_in_cluster" msgid="2668300546822672927">"Eman instrumentu lukuan bistaratu beharreko jarduerak azaltzeko baimena aplikazioari"</string>
     <string name="car_permission_car_cluster_control" msgid="1382247204230165674">"Instrumentu lukua kontrolatzeko aukera"</string>
-    <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"Abiarazi aplikazioak instrumentu lukuan"</string>
+    <string name="car_permission_desc_car_cluster_control" msgid="9222776665281176031">"Exekutatu aplikazioak instrumentu lukuan"</string>
     <string name="car_permission_car_monitor_cluster_navigation_state" msgid="7025307242306902441">"Instrumentuen lukuko nabigazioaren egoera"</string>
     <string name="car_permission_desc_car_monitor_cluster_navigation_state" msgid="8745047153878713339">"Entzun instrumentuen lukuko nabigazioaren egoeran ematen diren aldaketak"</string>
     <string name="car_permission_label_car_ux_restrictions_configuration" msgid="6801393970411049725">"Erabiltzeko moduaren murriztapenen konfigurazioa"</string>
@@ -93,7 +93,7 @@
     <string name="car_permission_label_use_evs_service" msgid="1729276125209310607">"Erabili autoko EVS zerbitzua"</string>
     <string name="car_permission_desc_use_evs_service" msgid="2374737642186632816">"Harpidetu EVSren bideo-igorpenetara"</string>
     <string name="car_permission_label_request_evs_activity" msgid="3906551972883482883">"Eskatu EVSko aurrebistaren jarduera"</string>
-    <string name="car_permission_desc_request_evs_activity" msgid="4582768053649138488">"Eskatu sistemari EVSko aurrebista abiarazteko"</string>
+    <string name="car_permission_desc_request_evs_activity" msgid="4582768053649138488">"Eskatu sistemari EVSko aurrebista exekutatzeko"</string>
     <string name="car_permission_label_control_evs_activity" msgid="2030069860204405679">"Kontrolatu EVSko aurrebistaren jarduera"</string>
     <string name="car_permission_desc_control_evs_activity" msgid="691646545916976346">"Kontrolatu sistemaren EVSko aurrebistaren jarduera"</string>
     <string name="car_permission_label_use_evs_camera" msgid="3607720208623955067">"Erabili EVSaren kamera"</string>
@@ -120,8 +120,8 @@
     <string name="car_permission_desc_control_car_airbags" msgid="6181671903761622348">"Autoaren airbagak kontrolatu."</string>
     <string name="car_permission_label_car_info" msgid="4707513570676492315">"atzitu autoaren oinarrizko informazioa"</string>
     <string name="car_permission_desc_car_info" msgid="2118081474543537653">"Atzitu autoaren oinarrizko informazioa."</string>
-    <string name="car_permission_label_privileged_car_info" msgid="1304018073760220785">"atzitu autoaren isilpeko informazioa"</string>
-    <string name="car_permission_desc_privileged_car_info" msgid="2245117655328125350">"Atzitu autoaren isilpeko informazioa."</string>
+    <string name="car_permission_label_privileged_car_info" msgid="1304018073760220785">"atzitu autoaren informazio pribilegiatua"</string>
+    <string name="car_permission_desc_privileged_car_info" msgid="2245117655328125350">"Atzitu autoaren informazio pribilegiatua."</string>
     <string name="car_permission_label_vendor_permission_info" msgid="4471260460536888654">"atzitu autoaren saltzailearen baimenari buruzko informazioa"</string>
     <string name="car_permission_desc_vendor_permission_info" msgid="8152113853528488398">"Atzitu autoaren saltzailearen baimenari buruzko informazioa"</string>
     <string name="car_permission_label_car_exterior_lights" msgid="541304469604902110">"irakurri autoaren kanpoaldeko argien egoera"</string>
diff --git a/service/res/values-gl/strings.xml b/service/res/values-gl/strings.xml
index 744f852054..aa7a48a2b2 100644
--- a/service/res/values-gl/strings.xml
+++ b/service/res/values-gl/strings.xml
@@ -120,8 +120,8 @@
     <string name="car_permission_desc_control_car_airbags" msgid="6181671903761622348">"Controlar os airbags do coche."</string>
     <string name="car_permission_label_car_info" msgid="4707513570676492315">"acceder a información básica do coche"</string>
     <string name="car_permission_desc_car_info" msgid="2118081474543537653">"Acceder a información básica do coche."</string>
-    <string name="car_permission_label_privileged_car_info" msgid="1304018073760220785">"Acceder á información privilexiada do coche"</string>
-    <string name="car_permission_desc_privileged_car_info" msgid="2245117655328125350">"Acceder á información privilexiada do coche."</string>
+    <string name="car_permission_label_privileged_car_info" msgid="1304018073760220785">"Acceder á información confidencial do coche"</string>
+    <string name="car_permission_desc_privileged_car_info" msgid="2245117655328125350">"Acceder á información confidencial do coche."</string>
     <string name="car_permission_label_vendor_permission_info" msgid="4471260460536888654">"acceder á información sobre os permisos do vendedor do coche"</string>
     <string name="car_permission_desc_vendor_permission_info" msgid="8152113853528488398">"Acceder á información sobre os permisos do vendedor do coche."</string>
     <string name="car_permission_label_car_exterior_lights" msgid="541304469604902110">"ler o estado das luces exteriores do dispositivo"</string>
diff --git a/service/res/values-it/strings.xml b/service/res/values-it/strings.xml
index 2daf07aa98..73c1f4375b 100644
--- a/service/res/values-it/strings.xml
+++ b/service/res/values-it/strings.xml
@@ -26,8 +26,8 @@
     <string name="car_permission_desc_control_car_energy" msgid="8765015897869031807">"Consente di controllare le impostazioni di ricarica del tuo veicolo elettrico."</string>
     <string name="car_permission_label_adjust_range_remaining" msgid="839033553999920138">"regolazione dell\'autonomia rimanente dell\'auto"</string>
     <string name="car_permission_desc_adjust_range_remaining" msgid="2369321650437370673">"Consente di regolare il valore dell\'autonomia rimanente dell\'auto."</string>
-    <string name="car_permission_label_hvac" msgid="1499454192558727843">"Accesso al sistema HVAC dell\'automobile"</string>
-    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Consente di accedere al sistema HVAC dell\'automobile."</string>
+    <string name="car_permission_label_hvac" msgid="1499454192558727843">"Accesso all\'impianto di climatizzazione dell\'automobile"</string>
+    <string name="car_permission_desc_hvac" msgid="3754229695589774195">"Consente di accedere all\'impianto di climatizzazione dell\'automobile."</string>
     <string name="car_permission_label_mileage" msgid="4661317074631150551">"Accesso alle informazioni sul consumo di carburante dell\'automobile"</string>
     <string name="car_permission_desc_mileage" msgid="7179735693278681090">"Consente di accedere alle informazioni sul consumo di carburante dell\'automobile."</string>
     <string name="car_permission_label_speed" msgid="1149027717860529745">"Lettura della velocità dell\'automobile"</string>
diff --git a/service/res/values-pa/strings.xml b/service/res/values-pa/strings.xml
index 542195cdf1..207d6454a3 100644
--- a/service/res/values-pa/strings.xml
+++ b/service/res/values-pa/strings.xml
@@ -38,8 +38,8 @@
     <string name="car_permission_desc_vendor_extension" msgid="2970718502334714035">"ਕਾਰ ਦੀ ਖਾਸ ਜਾਣਕਾਰੀ ਦੇ ਵਟਾਂਦਰੇ ਲਈ ਤੁਹਾਡੀ ਕਾਰ ਦੇ ਵਿਕਰੇਤਾ ਚੈਨਲ ਤੱਕ ਪਹੁੰਚ।"</string>
     <string name="car_permission_label_radio" msgid="6009465291685935112">"ਕਾਰ ਦੇ ਰੇਡੀਓ ਦਾ ਪ੍ਰਬੰਧਨ"</string>
     <string name="car_permission_desc_radio" msgid="3385999027478186964">"ਤੁਹਾਡੀ ਕਾਰ ਦੇ ਰੇਡੀਓ ਤੱਕ ਪਹੁੰਚ।"</string>
-    <string name="car_permission_label_projection" msgid="9107156380287576787">"ਕਾਰ ਦੀ ਡਿਸਪਲੇ \'ਤੇ ਫ਼ੋਨ ਦਾ ਇੰਟਰਫੇਸ ਦਿਖਾਉਣਾ"</string>
-    <string name="car_permission_desc_projection" msgid="2352178999656292944">"ਕਿਸੇ ਐਪ ਨੂੰ ਕਾਰ ਦੀ ਡਿਸਪਲੇ \'ਤੇ ਫ਼ੋਨ ਦਾ ਇੰਟਰਫੇਸ ਦਿਖਾਉਣ ਦਿੰਦੀ ਹੈ।"</string>
+    <string name="car_permission_label_projection" msgid="9107156380287576787">"ਕਾਰ ਦੀ ਡਿਸਪਲੇ \'ਤੇ ਫ਼ੋਨ ਦਾ ਇੰਟਰਫ਼ੇਸ ਦਿਖਾਉਣਾ"</string>
+    <string name="car_permission_desc_projection" msgid="2352178999656292944">"ਕਿਸੇ ਐਪ ਨੂੰ ਕਾਰ ਦੀ ਡਿਸਪਲੇ \'ਤੇ ਫ਼ੋਨ ਦਾ ਇੰਟਰਫ਼ੇਸ ਦਿਖਾਉਣ ਦਿੰਦੀ ਹੈ।"</string>
     <string name="car_permission_label_access_projection_status" msgid="4231618890836627402">"ਯੋਜਨਾਬੰਦੀ ਸਥਿਤੀ ਤੱਕ ਪਹੁੰਚ"</string>
     <string name="car_permission_desc_access_projection_status" msgid="8497351979100616278">"ਕਿਸੇ ਐਪ ਨੂੰ ਕਾਰ ਦੀ ਡਿਸਪਲੇ \'ਤੇ ਹੋਰ ਐਪਾਂ ਦੀ ਸਥਿਤੀ ਦੇਖਣ ਦਿਓ।"</string>
     <string name="car_permission_label_audio_volume" msgid="310587969373137690">"ਕਾਰ ਦੀ ਆਡੀਓ ਅਵਾਜ਼ \'ਤੇ ਕੰਟਰੋਲ"</string>
diff --git a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-eu/strings.xml b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-eu/strings.xml
index f48896a450..2dd6c62cef 100644
--- a/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-eu/strings.xml
+++ b/tests/MultiDisplaySecondaryHomeTestLauncher/res/values-eu/strings.xml
@@ -19,11 +19,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="3477029631237519798">"Pantaila bat baino gehiago"</string>
     <string name="md_launcher" msgid="327845696688732506">"Pantaila bat baino gehiagoko moduaren abiarazlea"</string>
-    <string name="couldnt_launch" msgid="7815676424138012351">"Ezin izan da abiarazi jarduera"</string>
+    <string name="couldnt_launch" msgid="7815676424138012351">"Ezin izan da exekutatu jarduera"</string>
     <string name="select_display" msgid="1682700853391296117">"Hautatu pantaila bat"</string>
     <string name="add_app_shortcut" msgid="8873512136913188432">"Gehitu aplikaziorako lasterbidea"</string>
     <string name="set_wallpaper" msgid="3650915172749345197">"Ezarri horma-papera"</string>
-    <string name="new_instance" msgid="1924479866055190730">"Eskatu beste instantzia batean abiarazteko"</string>
+    <string name="new_instance" msgid="1924479866055190730">"Eskatu beste instantzia batean exekutatzeko"</string>
     <string name="wallpaper_description" msgid="5885164573334720996">"Pantaila baterako baino gehiagotarako ereduzko horma-papera"</string>
     <string name="exit" msgid="3648703694102318310">"Irten"</string>
 </resources>