[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c6ac5c4ecd -s ours am: e24b0da533 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/KeyChain/+/19842943
Change-Id: Iddfd9fc74853e5b490b157581de183cbdec2a7be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 8e7b7f6..56f6f22 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -17,11 +17,11 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="app_name" msgid="170210454004696382">"Key Chain"</string>
- <string name="title_select_cert" msgid="3588447616418041699">"Alege un certificat"</string>
+ <string name="title_select_cert" msgid="3588447616418041699">"Alegeți un certificat"</string>
<string name="requesting_application" msgid="1589142627467598421">"Aplicația %s a solicitat un certificat. Alegerea unui certificat va permite aplicației să utilizeze această identitate în relația sa cu serverele, acum și în viitor."</string>
- <string name="requesting_server" msgid="5832565605998634370">"Aplicația a identificat serverul solicitant drept %s, dar ar trebui să acorzi aplicației acces la certificat numai dacă ai încredere în aceasta."</string>
- <string name="install_new_cert_message" msgid="4451971501142085495">"Poți instala certificate dintr-un fișier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
- <string name="allow_button" msgid="3030990695030371561">"Selectează"</string>
- <string name="deny_button" msgid="3766539809121892584">"Refuză"</string>
+ <string name="requesting_server" msgid="5832565605998634370">"Aplicația a identificat serverul solicitant drept %s, dar ar trebui să acordați aplicației acces la certificat numai dacă aveți încredere în aceasta."</string>
+ <string name="install_new_cert_message" msgid="4451971501142085495">"Puteți instala certificate dintr-un fișier PKCS#12 cu o extensie %1$s sau %2$s care se află pe stocarea externă."</string>
+ <string name="allow_button" msgid="3030990695030371561">"Selectați"</string>
+ <string name="deny_button" msgid="3766539809121892584">"Refuzați"</string>
<string name="loading_certs_message" msgid="2152223341043639547">"%s caută certificatul…"</string>
</resources>
diff --git a/robotests/src/com/android/keychain/KeyChainServiceRoboTest.java b/robotests/src/com/android/keychain/KeyChainServiceRoboTest.java
index 6392af4..bae754b 100644
--- a/robotests/src/com/android/keychain/KeyChainServiceRoboTest.java
+++ b/robotests/src/com/android/keychain/KeyChainServiceRoboTest.java
@@ -21,9 +21,8 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
-import static org.mockito.ArgumentMatchers.anyVararg;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
@@ -213,7 +212,7 @@
}
mKeyChain.deleteCaCertificate("alias");
- verify(mockInjector, never()).writeSecurityEvent(anyInt(), anyInt(), anyVararg());
+ verify(mockInjector, never()).writeSecurityEvent(anyInt(), anyInt(), any());
}
private X509Certificate parseCertificate(String cert) throws CertificateException {
diff --git a/tests/src/com/android/keychain/tests/KeyChainActivityTest.java b/tests/src/com/android/keychain/tests/KeyChainActivityTest.java
index 9acb6de..f3a2bb5 100644
--- a/tests/src/com/android/keychain/tests/KeyChainActivityTest.java
+++ b/tests/src/com/android/keychain/tests/KeyChainActivityTest.java
@@ -47,7 +47,7 @@
import java.security.spec.InvalidKeySpecException;
import java.security.spec.PKCS8EncodedKeySpec;
import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
import java.util.concurrent.CancellationException;
import javax.security.auth.x500.X500Principal;
@@ -230,7 +230,7 @@
KeyStore keyStore, X500Principal issuer) {
return new CertificateParametersFilter(
keyStore, new String[] {},
- new ArrayList<byte[]>(Arrays.asList(issuer.getEncoded())));
+ new ArrayList<byte[]>(Collections.singletonList(issuer.getEncoded())));
}
private static X509Certificate parseCertificate(byte[] certificateBytes) {
