Snap for 8866753 from ddbda28d76e2cfa76cf6fc4081d4ea214a110d7b to mainline-go-os-statsd-releaseaml_go_sta_330911000android13-mainline-go-os-statsd-release

Change-Id: Iac4c867e7e8d9c197abd1cb736fd03b5a198de48

8 files changed, 22 insertions, 14 deletions

diff --git a/car-usb-handler/res/values-or/strings.xml b/car-usb-handler/res/values-or/strings.xml
index 9642ba74b9..97c08e4aed 100644
--- a/car-usb-handler/res/values-or/strings.xml
+++ b/car-usb-handler/res/values-or/strings.xml
@@ -21,7 +21,7 @@
     <string name="usb_pref_delete_title" msgid="3885061814853467483">"USB ଡିଭାଇସ୍ ପାଇଁ ହ୍ୟାଣ୍ଡଲିଂ ଆପ୍‌କୁ କାଢ଼ିଦିଅନ୍ତୁ"</string>
     <string name="usb_pref_delete_message" msgid="5849493572520646218">"ଆପଣ କ\'ଣ ନିଶ୍ଚିତ ଭାବରେ %1$s ପାଇଁ ଡିଫଲ୍ଟ ହ୍ୟାଣ୍ଡଲିଂ ଆପ୍‍କୁ ଡିଲିଟ୍ କରିବାକୁ ଚାହୁଁଛନ୍ତି?"</string>
     <string name="usb_pref_delete_yes" msgid="7803356145103146036">"ହଁ"</string>
-    <string name="usb_pref_delete_cancel" msgid="5999791462730255929">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="usb_pref_delete_cancel" msgid="5999791462730255929">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="usb_resolving_handlers" msgid="1943100136172948686">"ସମର୍ଥିତ ହ୍ୟାଣ୍ଡଲର୍ ପ୍ରାପ୍ତ କରାଯାଉଛି"</string>
     <string name="usb_unknown_device" msgid="4211439272338937095">"ଅଜଣା USB ଡିଭାଇସ୍"</string>
     <string name="usb_boot_service_notification" msgid="8519949189071048797">"USB ଡିଭାଇସ୍‌ଗୁଡ଼ିକର ବିଶ୍ଲେଷଣ କରୁଛି"</string>
diff --git a/car_product/build/preinstalled-packages-product-car-base.xml b/car_product/build/preinstalled-packages-product-car-base.xml
index c39b6d3703..7426e5cc86 100644
--- a/car_product/build/preinstalled-packages-product-car-base.xml
+++ b/car_product/build/preinstalled-packages-product-car-base.xml
@@ -172,7 +172,7 @@
     </install-in-user-type>
 
     <!-- Needs to run on system user otherwise cannot find available device -->
-    <install-in-user-type package="com.android.bluetooth.services">
+    <install-in-user-type package="com.android.bluetooth">
         <install-in user-type="FULL" />
         <install-in user-type="SYSTEM" />
     </install-in-user-type>
diff --git a/service/res/values-ro/strings.xml b/service/res/values-ro/strings.xml
index 1a3773a4af..7e222bc842 100644
--- a/service/res/values-ro/strings.xml
+++ b/service/res/values-ro/strings.xml
@@ -16,7 +16,7 @@
 
 <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" msgid="2215078736675564541">"Accesează informațiile despre mașină"</string>
+    <string name="car_permission_label" msgid="2215078736675564541">"informațiile despre mașină"</string>
     <string name="car_permission_desc" msgid="3584369074931334964">"să acceseze informațiile despre mașină"</string>
     <string name="car_permission_label_camera" msgid="3725702064841827180">"Accesează camera mașinii"</string>
     <string name="car_permission_desc_camera" msgid="917024932164501426">"Accesează camerele mașinii."</string>
diff --git a/tests/BugReportApp/res/values-or/strings.xml b/tests/BugReportApp/res/values-or/strings.xml
index 79ce668704..d4a7771818 100644
--- a/tests/BugReportApp/res/values-or/strings.xml
+++ b/tests/BugReportApp/res/values-or/strings.xml
@@ -23,7 +23,7 @@
     <string name="bugreport_info_status" msgid="7211044508792815451">"ସ୍ଥିତି:"</string>
     <string name="bugreport_info_expires_soon_notice" msgid="927139313070992675">"ଏହି ବଗ୍ ରିପୋର୍ଟର ମିଆଦ ଶୀଘ୍ର ସମାପ୍ତ ହେବ"</string>
     <string name="bugreport_dialog_submit" msgid="2789636252713280633">"ଦାଖଲ କରନ୍ତୁ"</string>
-    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ବାତିଲ୍ କରନ୍ତୁ"</string>
+    <string name="bugreport_dialog_cancel" msgid="4741928791364757040">"ବାତିଲ କରନ୍ତୁ"</string>
     <string name="bugreport_dialog_upload" msgid="2517386929450370781">"ଅପ୍‌ଲୋଡ୍"</string>
     <string name="bugreport_dialog_save" msgid="3291363266190644226">"ସେଭ୍ କରନ୍ତୁ"</string>
     <string name="bugreport_dialog_show_bugreports" msgid="6964385141627170297">"ବଗ୍ ରିପୋର୍ଟ୍‍ଗୁଡ଼ିକୁ ଦେଖାନ୍ତୁ"</string>
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java
index c67840f33b..88c2a9f516 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java
@@ -162,7 +162,7 @@ public class PropertyTestFragment extends Fragment implements OnItemSelectedList
             } catch (Exception e) {
                 Log.e(TAG, "Failed to set VHAL property", e);
                 Toast.makeText(mActivity, "Failed to set VHAL property: " + e.getMessage(),
-                        Toast.LENGTH_SHORT).show();
+                        Toast.LENGTH_LONG).show();
             }
         });
 
diff --git a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/ConfigurationUpdater.java b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/ConfigurationUpdater.java
index bdf780f7a8..6ab3322cd9 100644
--- a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/ConfigurationUpdater.java
+++ b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/ConfigurationUpdater.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.EthernetManager;
 import android.net.EthernetNetworkManagementException;
+import android.net.EthernetNetworkSpecifier;
 import android.net.EthernetNetworkUpdateRequest;
 import android.net.IpConfiguration;
 import android.net.LinkAddress;
@@ -55,7 +56,8 @@ public final class ConfigurationUpdater {
 
         EthernetNetworkUpdateRequest request = new EthernetNetworkUpdateRequest.Builder()
                 .setIpConfiguration(getIpConfiguration(ipConfigurationText))
-                .setNetworkCapabilities(getCapabilities(networkCapabilitiesText, packageNames))
+                .setNetworkCapabilities(getCapabilities(
+                        interfaceName, networkCapabilitiesText, packageNames))
                 .build();
 
         mEthernetManager.updateConfiguration(interfaceName, request,
@@ -72,7 +74,7 @@ public final class ConfigurationUpdater {
     }
 
     @Nullable
-    private NetworkCapabilities getCapabilities(String networkCapabilitiesText,
+    private NetworkCapabilities getCapabilities(String iface, String networkCapabilitiesText,
             String packageNames) throws PackageManager.NameNotFoundException {
         // TODO: Allow for setting package names without capabilities. In this case, the existing
         //  capabilities should be used.
@@ -82,7 +84,8 @@ public final class ConfigurationUpdater {
 
         NetworkCapabilities.Builder networkCapabilitiesBuilder =
                 NetworkCapabilities.Builder.withoutDefaultCapabilities()
-                        .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET);
+                        .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
+                        .setNetworkSpecifier(new EthernetNetworkSpecifier(iface));
 
         for (int capability : getCapabilitiesList(networkCapabilitiesText)) {
             networkCapabilitiesBuilder.addCapability(capability);
diff --git a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/CurrentEthernetNetworksViewModel.java b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/CurrentEthernetNetworksViewModel.java
index 1cf5d5ad0a..1d62a60f70 100644
--- a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/CurrentEthernetNetworksViewModel.java
+++ b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/CurrentEthernetNetworksViewModel.java
@@ -18,6 +18,7 @@ package com.google.android.car.networking.railway;
 
 import android.app.Application;
 import android.net.ConnectivityManager;
+import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -102,8 +103,10 @@ public final class CurrentEthernetNetworksViewModel extends AndroidViewModel {
                 sb.append(linkProperties.getInterfaceName());
 
                 sb.append("\n\t");
-                sb.append("ip: ");
-                sb.append(linkProperties.getLinkAddresses().get(0).getAddress().getHostAddress());
+                sb.append("ip addresses: ");
+                for (LinkAddress address : linkProperties.getLinkAddresses()) {
+                    sb.append("\n\t\t").append(address.getAddress().getHostAddress());
+                }
             }
 
             if (networkCapabilities != null) {
diff --git a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/MainActivity.java b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/MainActivity.java
index a40042b7c5..a26f3a9a90 100644
--- a/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/MainActivity.java
+++ b/tests/RailwayReferenceApp/src/com/google/android/car/networking/railway/MainActivity.java
@@ -184,14 +184,16 @@ public final class MainActivity extends FragmentActivity {
             validateInterfaceName(getEnableDisableConnectIface());
             NetworkRequest request =
                     new NetworkRequest.Builder()
+                            .clearCapabilities()
                             .addTransportType(NetworkCapabilities.TRANSPORT_ETHERNET)
                             .setNetworkSpecifier(
-                            new EthernetNetworkSpecifier(getEnableDisableConnectIface())).build();
+                                    new EthernetNetworkSpecifier(getEnableDisableConnectIface()))
+                            .build();
             mConnectivityManager.requestNetwork(request,
                     new InterfaceConnectorCallback(),
                     new Handler(Looper.getMainLooper()),
                     Math.toIntExact(REQUEST_NETWORK_TIMEOUT.toMillis()));
-        } catch (IllegalArgumentException e) {
+        } catch (SecurityException | IllegalArgumentException e) {
             showOperationResultDialog(e.getLocalizedMessage(), /* isSuccess= */ false);
         }
     }
@@ -221,8 +223,8 @@ public final class MainActivity extends FragmentActivity {
         public void onAvailable(Network network) {
             super.onAvailable(network);
 
-            try {
-                network.bindSocket(new Socket());
+            try (Socket socket = new Socket()) {
+                network.bindSocket(socket);
             } catch (IOException e) {
                 showOperationResultDialog(e.getLocalizedMessage(), /* isSuccess= */ false);
                 return;