Merge "Specify the expected VPN network callbacks." into main am: cd4258dcb1 am: 00509b52fe
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3532950
Change-Id: Ic047ac7f7266783a4deec09ee0077e273af0c92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/nearby/framework/java/android/nearby/CredentialElement.java b/nearby/framework/java/android/nearby/CredentialElement.java
index 7a43b01..d7c63c4 100644
--- a/nearby/framework/java/android/nearby/CredentialElement.java
+++ b/nearby/framework/java/android/nearby/CredentialElement.java
@@ -50,8 +50,7 @@
@Override
public CredentialElement createFromParcel(Parcel in) {
String key = in.readString();
- byte[] value = new byte[in.readInt()];
- in.readByteArray(value);
+ byte[] value = in.createByteArray();
return new CredentialElement(key, value);
}
@@ -69,7 +68,6 @@
@Override
public void writeToParcel(@NonNull Parcel dest, int flags) {
dest.writeString(mKey);
- dest.writeInt(mValue.length);
dest.writeByteArray(mValue);
}
diff --git a/service/ServiceConnectivityResources/res/values-mr/strings.xml b/service/ServiceConnectivityResources/res/values-mr/strings.xml
index 4797ff1..b0da141 100644
--- a/service/ServiceConnectivityResources/res/values-mr/strings.xml
+++ b/service/ServiceConnectivityResources/res/values-mr/strings.xml
@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="connectivityResourcesAppLabel" msgid="2476261877900882974">"सिस्टम कनेक्टिव्हिटी चे स्रोत"</string>
+ <string name="connectivityResourcesAppLabel" msgid="2476261877900882974">"सिस्टीम कनेक्टिव्हिटीचे स्रोत"</string>
<string name="wifi_available_sign_in" msgid="8041178343789805553">"वाय-फाय नेटवर्कमध्ये साइन इन करा"</string>
<string name="network_available_sign_in" msgid="2622520134876355561">"नेटवर्कवर साइन इन करा"</string>
<!-- no translation found for network_available_sign_in_detailed (8439369644697866359) -->