Snap for 9669149 from d3512ca9b8f87ff6d352975de40240f0180f37e5 to mainline-tethering-release
Change-Id: I7bf041733d065c6051f4f9c75aa24d7e14d266e4
diff --git a/FrameworkPackageStubs/res/values-ca/strings.xml b/FrameworkPackageStubs/res/values-ca/strings.xml
index a8abcb4..defbf75 100644
--- a/FrameworkPackageStubs/res/values-ca/strings.xml
+++ b/FrameworkPackageStubs/res/values-ca/strings.xml
@@ -3,6 +3,6 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="6179574017413146651">"Activity Stub"</string>
<string name="message_not_supported" msgid="133939962837892495">"No hi ha cap app que pugui processar-ho"</string>
- <string name="pip_not_supported" msgid="8681268258599412706">"La funció pantalla en pantalla no és compatible amb aquest dispositiu"</string>
+ <string name="pip_not_supported" msgid="8681268258599412706">"La funció d\'imatge sobre imatge no és compatible amb aquest dispositiu"</string>
<string name="stub_name" msgid="3987164490218189006">"Cap"</string>
</resources>
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
index c704544..b0dce96 100644
--- a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
+++ b/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
@@ -17,6 +17,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="owner_name" msgid="3416113395996003764">"Autista"</string>
+ <string name="owner_name" msgid="3416113395996003764">"Conducente"</string>
<string name="permlab_accessCoarseLocation" msgid="2494909511737161237">"Accesso alla posizione approssimativa solo in primo piano"</string>
</resources>
diff --git a/experimental/service/res/values-it/strings.xml b/experimental/service/res/values-it/strings.xml
index a48bb0f..389a786 100644
--- a/experimental/service/res/values-it/strings.xml
+++ b/experimental/service/res/values-it/strings.xml
@@ -16,6 +16,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione dell\'autista"</string>
- <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Leggi il livello di distrazione dell\'autista"</string>
+ <string name="car_permission_label_driver_distraction" msgid="4362982084385602611">"Lettura del livello di distrazione del conducente"</string>
+ <string name="car_permission_desc_driver_distraction" msgid="2506435411900299264">"Lettura del livello di distrazione del conducente."</string>
</resources>
diff --git a/service/res/values-eu/strings.xml b/service/res/values-eu/strings.xml
index 24e86c8..44299cd 100644
--- a/service/res/values-eu/strings.xml
+++ b/service/res/values-eu/strings.xml
@@ -41,7 +41,7 @@
<string name="car_permission_label_projection" msgid="9107156380287576787">"proiektatu telefonoaren interfazea autoaren pantailan"</string>
<string name="car_permission_desc_projection" msgid="2352178999656292944">"Telefonoaren interfazea autoaren pantailan proiektatzeko baimena ematen dio aplikazioari."</string>
<string name="car_permission_label_access_projection_status" msgid="4231618890836627402">"atzitu proiekzio-egoera"</string>
- <string name="car_permission_desc_access_projection_status" msgid="8497351979100616278">"Autoaren pantailan proiektatutako aplikazioen egoera atzitzeko baimena ematen dio aplikazioari."</string>
+ <string name="car_permission_desc_access_projection_status" msgid="8497351979100616278">"Autoaren pantailan proiektatutako aplikazioen egoera erabiltzeko baimena ematen dio aplikazioari."</string>
<string name="car_permission_label_bind_projection_service" msgid="5362076216606651526">"lotu proiekzio-zerbitzu batekin"</string>
<string name="car_permission_desc_bind_projection_service" msgid="2282657787853408639">"Proiekzio-zerbitzu baten goi-mailako interfazeari lotzeko baimena ematen die titularrei. Aplikazio normalek ez lukete beharko."</string>
<string name="car_permission_label_audio_volume" msgid="310587969373137690">"kontrolatu autoaren audioaren bolumena"</string>
diff --git a/tests/CarLibTests/Android.bp b/tests/CarLibTests/Android.bp
index 1484374..f0914fa 100644
--- a/tests/CarLibTests/Android.bp
+++ b/tests/CarLibTests/Android.bp
@@ -35,9 +35,6 @@
libs: [
"android.car",
- "Robolectric_all-target",
- "robolectric_android-all-stub",
- "mockito-robolectric-prebuilt",
"truth-prebuilt",
"androidx.test.core",
"android.car.testapi",
@@ -45,5 +42,6 @@
],
instrumentation_for: "CarLibTestApp",
+ upstream: true,
}
