Merge tag 'android-13.0.0_r52' into staging/lineage-20.0_merge-android-13.0.0_r52
Android 13.0.0 Release 52 (TQ3A.230605.012)
# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZIi36wAKCRDorT+BmrEO
# eLn3AKCHopz4Zv4j/CzUTfwO+NVaMUUlAwCggAUKFIFt1DTl+gopp49WsGkJF6M=
# =mDLa
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Jun 13 21:39:39 2023 EEST
# gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 1716 signatures in the past
# 19 months. Encrypted 4 messages in the past 17 months.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78
# By Bill Yi (1) and Yichun Li (1)
# Via Android Build Coastguard Worker (3) and Yichun Li (1)
* tag 'android-13.0.0_r52':
Update UiAutomator Condition
Import translations. DO NOT MERGE ANYWHERE
Change-Id: I8a59dd2b6e1e7f3c9c49533ac51626ca9c37e876
diff --git a/nearby/halfsheet/res/values-ky/strings.xml b/nearby/halfsheet/res/values-ky/strings.xml
index 812e0e8..b0dfe20 100644
--- a/nearby/halfsheet/res/values-ky/strings.xml
+++ b/nearby/halfsheet/res/values-ky/strings.xml
@@ -25,5 +25,5 @@
<string name="paring_action_save" msgid="6259357442067880136">"Сактоо"</string>
<string name="paring_action_connect" msgid="4801102939608129181">"Туташуу"</string>
<string name="paring_action_launch" msgid="8940808384126591230">"Жөндөө"</string>
- <string name="paring_action_settings" msgid="424875657242864302">"Жөндөөлөр"</string>
+ <string name="paring_action_settings" msgid="424875657242864302">"Параметрлер"</string>
</resources>
diff --git a/nearby/tests/integration/untrusted/src/androidx/test/uiautomator/LogcatWaitMixin.java b/nearby/tests/integration/untrusted/src/androidx/test/uiautomator/LogcatWaitMixin.java
index 86e39dc..8b5ac12 100644
--- a/nearby/tests/integration/untrusted/src/androidx/test/uiautomator/LogcatWaitMixin.java
+++ b/nearby/tests/integration/untrusted/src/androidx/test/uiautomator/LogcatWaitMixin.java
@@ -54,7 +54,7 @@
@NonNull String specificLog, @NonNull Date startTime) {
return new Condition<UiDevice, Boolean>() {
@Override
- Boolean apply(UiDevice device) {
+ public Boolean apply(UiDevice device) {
String logcatLogs;
try {
logcatLogs = device.executeShellCommand("logcat -v time -v year -d");