Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebd1f66c authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7048988 from 01b2e17c to rvc-qpr2-release 

Change-Id: Ia611054afc8095f2a156f21b24799a9e95effdb1
parents 7fef9120 01b2e17c

packages/SettingsLib/res/values-in/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ 
    <string name="enable_adb_summary" msgid="3711526030096574316">"Mode debug ketika USB tersambung"</string>

    <string name="clear_adb_keys" msgid="3010148733140369917">"Cabut otorisasi debug USB"</string>

    <string name="enable_adb_wireless" msgid="6973226350963971018">"Proses debug nirkabel"</string>

    <string name="enable_adb_wireless_summary" msgid="7344391423657093011">"Mode debug saat Wi-Fi tersambung"</string>

    <string name="enable_adb_wireless_summary" msgid="7344391423657093011">"Mode debug saat Wi-Fi terhubung"</string>

    <string name="adb_wireless_error" msgid="721958772149779856">"Error"</string>

    <string name="adb_wireless_settings" msgid="2295017847215680229">"Proses debug nirkabel"</string>

    <string name="adb_wireless_list_empty_off" msgid="1713707973837255490">"Untuk melihat dan menggunakan perangkat yang tersedia, aktifkan proses debug nirkabel"</string>
@@ -225,13 +225,13 @@ 
    <string name="adb_pairing_device_dialog_title" msgid="7141739231018530210">"Sambungkan dengan perangkat"</string>

    <string name="adb_pairing_device_dialog_pairing_code_label" msgid="3639239786669722731">"Kode penyambungan Wi-Fi"</string>

    <string name="adb_pairing_device_dialog_failed_title" msgid="3426758947882091735">"Penyambungan perangkat gagal"</string>

    <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Pastikan perangkat tersambung ke jaringan yang sama."</string>

    <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Menyambungkan perangkat melalui Wi‑Fi dengan memindai Kode QR"</string>

    <string name="adb_pairing_device_dialog_failed_msg" msgid="6611097519661997148">"Pastikan perangkat terhubung ke jaringan yang sama."</string>

    <string name="adb_wireless_qrcode_summary" msgid="8051414549011801917">"Sambungkan perangkat melalui Wi‑Fi dengan memindai Kode QR"</string>

    <string name="adb_wireless_verifying_qrcode_text" msgid="6123192424916029207">"Menyambungkan perangkat…"</string>

    <string name="adb_qrcode_pairing_device_failed_msg" msgid="6936292092592914132">"Gagal menyambungkan perangkat. Kode QR salah, atau perangkat tidak tersambung ke jaringan yang sama."</string>

    <string name="adb_wireless_ip_addr_preference_title" msgid="8335132107715311730">"Alamat IP &amp; Port"</string>

    <string name="adb_wireless_qrcode_pairing_title" msgid="1906409667944674707">"Memindai kode QR"</string>

    <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Menyambungkan perangkat melalui Wi‑Fi dengan memindai Kode QR"</string>

    <string name="adb_wireless_qrcode_pairing_description" msgid="6014121407143607851">"Sambungkan perangkat melalui Wi‑Fi dengan memindai Kode QR"</string>

    <string name="adb_wireless_no_network_msg" msgid="2365795244718494658">"Harap sambungkan ke jaringan Wi-Fi"</string>

    <string name="keywords_adb_wireless" msgid="6507505581882171240">"adb, debug, dev"</string>

    <string name="bugreport_in_power" msgid="8664089072534638709">"Pintasan laporan bug"</string>

packages/SettingsLib/res/values-uz/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -423,12 +423,12 @@ 
    <string name="power_remaining_settings_home_page" msgid="4885165789445462557">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> – <xliff:g id="TIME_STRING">%2$s</xliff:g>"</string>

    <string name="power_remaining_duration_only" msgid="8264199158671531431">"Taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi"</string>

    <string name="power_discharging_duration" msgid="1076561255466053220">"Taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <string name="power_remaining_duration_only_enhanced" msgid="2527842780666073218">"Joriy holatda taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi"</string>

    <string name="power_discharging_duration_enhanced" msgid="1800465736237672323">"Joriy holatda taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <string name="power_remaining_duration_only_enhanced" msgid="2527842780666073218">"Quvvati tugashiga taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi"</string>

    <string name="power_discharging_duration_enhanced" msgid="1800465736237672323">"Quvvati tugahsiga taxminan <xliff:g id="TIME_REMAINING">%1$s</xliff:g> qoldi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <!-- no translation found for power_remaining_duration_only_short (7438846066602840588) -->

    <skip />

    <string name="power_discharge_by_enhanced" msgid="563438403581662942">"Joriy holatda taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <string name="power_discharge_by_only_enhanced" msgid="3268796172652988877">"Joriy holatda taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha davom etadi"</string>

    <string name="power_discharge_by_enhanced" msgid="563438403581662942">"Shunday ishlatishda taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha yetadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <string name="power_discharge_by_only_enhanced" msgid="3268796172652988877">"Quvvati tugashiga taxminan <xliff:g id="TIME">%1$s</xliff:g> qoldi"</string>

    <string name="power_discharge_by" msgid="4113180890060388350">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha yetadi (<xliff:g id="LEVEL">%2$s</xliff:g>)"</string>

    <string name="power_discharge_by_only" msgid="92545648425937000">"Taxminan <xliff:g id="TIME">%1$s</xliff:g> gacha yetadi"</string>

    <string name="power_discharge_by_only_short" msgid="5883041507426914446">"<xliff:g id="TIME">%1$s</xliff:g> gacha"</string>
@@ -511,7 +511,7 @@ 
    <string name="media_transfer_this_device_name" msgid="2716555073132169240">"Telefon karnayi"</string>

    <string name="profile_connect_timeout_subtext" msgid="4043408193005851761">"Ulanishda muammo yuz berdi. Qurilmani oʻchiring va yoqing"</string>

    <string name="media_transfer_wired_device_name" msgid="4447880899964056007">"Simli audio qurilma"</string>

    <string name="help_label" msgid="3528360748637781274">"Yordam va fikr-mulohaza"</string>

    <string name="help_label" msgid="3528360748637781274">"Yordam/fikr-mulohaza"</string>

    <string name="storage_category" msgid="2287342585424631813">"Xotira"</string>

    <string name="shared_data_title" msgid="1017034836800864953">"Umumiy maʼlumotlar"</string>

    <string name="shared_data_summary" msgid="5516326713822885652">"Umumiy maʼlumotlarni ochish va oʻzgartirish"</string>

services/core/java/com/android/server/AlarmManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -3369,7 +3369,8 @@ class AlarmManagerService extends SystemService { 
                    if (mMaxDelayTime < thisDelayTime) {

                        mMaxDelayTime = thisDelayTime;

                    }

                    deliverAlarmsLocked(mPendingNonWakeupAlarms, nowELAPSED);

                    final ArrayList<Alarm> triggerList = new ArrayList<>(mPendingNonWakeupAlarms);

                    deliverAlarmsLocked(triggerList, nowELAPSED);

                    mPendingNonWakeupAlarms.clear();

                }

                if (mNonInteractiveStartTime > 0) {

services/tests/mockingservicestests/src/com/android/server/AlarmManagerServiceTest.java

+33 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ import org.mockito.MockitoSession; 
import org.mockito.quality.Strictness;



import java.util.ArrayList;

import java.util.concurrent.atomic.AtomicInteger;



@Presubmit

@RunWith(AndroidJUnit4.class)
@@ -1077,6 +1078,38 @@ public class AlarmManagerServiceTest { 
        }

    }



    /**

     * This tests that all non wakeup alarms are sent even when the mPendingNonWakeupAlarms gets

     * modified before the send is complete. This avoids bugs like b/175701084.

     */

    @Test

    public void allNonWakeupAlarmsSentAtomically() throws Exception {

        final int numAlarms = 5;

        final AtomicInteger alarmsFired = new AtomicInteger(0);

        for (int i = 0; i < numAlarms; i++) {

            final IAlarmListener listener = new IAlarmListener.Stub() {

                @Override

                public void doAlarm(IAlarmCompleteListener callback) throws RemoteException {

                    alarmsFired.incrementAndGet();

                    mService.mPendingNonWakeupAlarms.clear();

                }

            };

            setTestAlarmWithListener(ELAPSED_REALTIME, mNowElapsedTest + i + 5, listener);

        }

        doReturn(true).when(mService).checkAllowNonWakeupDelayLocked(anyLong());

        // Advance time past all expirations.

        mNowElapsedTest += numAlarms + 5;

        mTestTimer.expire();

        assertEquals(numAlarms, mService.mPendingNonWakeupAlarms.size());



        // All of these alarms should be sent on interactive state change to true

        mService.interactiveStateChangedLocked(false);

        mService.interactiveStateChangedLocked(true);



        assertEquals(numAlarms, alarmsFired.get());

        assertEquals(0, mService.mPendingNonWakeupAlarms.size());

    }



    @Test

    public void alarmCountOnPendingNonWakeupAlarmsRemoved() throws Exception {

        final int numAlarms = 10;