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

Commit 2413ac05 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 8793324 from 43456eee to tm-qpr1-release 

Change-Id: I61d3751b8236bdbd89d2f0315f20df1ada474aaa
parents d7445b6c 43456eee

core/java/android/app/IActivityTaskManager.aidl

+4 −1
Original line number Diff line number Diff line
@@ -263,9 +263,12 @@ interface IActivityTaskManager { 
     * @param taskId the id of the task to retrieve the sAutoapshots for

     * @param isLowResolution if set, if the snapshot needs to be loaded from disk, this will load

     *                          a reduced resolution of it, which is much faster

     * @param takeSnapshotIfNeeded if set, call {@link #takeTaskSnapshot} to trigger the snapshot

                                   if no cache exists.

     * @return a graphic buffer representing a screenshot of a task

     */

    android.window.TaskSnapshot getTaskSnapshot(int taskId, boolean isLowResolution);

    android.window.TaskSnapshot getTaskSnapshot(

            int taskId, boolean isLowResolution, boolean takeSnapshotIfNeeded);



    /**

     * @param taskId the id of the task to take a snapshot of

core/java/android/view/ViewRootImpl.java

+8 −1
Original line number Diff line number Diff line
@@ -604,6 +604,8 @@ public final class ViewRootImpl implements ViewParent, 
     */

    private boolean mCheckIfCanDraw = false;



    private boolean mDrewOnceForSync = false;



    int mSyncSeqId = 0;

    int mLastSyncSeqId = 0;
@@ -2999,6 +3001,9 @@ public final class ViewRootImpl implements ViewParent, 
                    reportNextDraw();

                    mSyncBuffer = true;

                    isSyncRequest = true;

                    if (!cancelDraw) {

                        mDrewOnceForSync = false;

                    }

                }



                final boolean surfaceControlChanged =
@@ -3520,9 +3525,11 @@ public final class ViewRootImpl implements ViewParent, 


        mCheckIfCanDraw = isSyncRequest || cancelDraw;



        boolean cancelAndRedraw = mAttachInfo.mTreeObserver.dispatchOnPreDraw() || cancelDraw;

        boolean cancelAndRedraw =

                mAttachInfo.mTreeObserver.dispatchOnPreDraw() || (cancelDraw && mDrewOnceForSync);

        if (!cancelAndRedraw) {

            createSyncIfNeeded();

            mDrewOnceForSync = true;

        }



        if (!isViewVisible) {

core/res/res/values-kk/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1139,7 +1139,7 @@ 
    <string name="replace" msgid="7842675434546657444">"… сөзін алмастыру"</string>

    <string name="delete" msgid="1514113991712129054">"Жою"</string>

    <string name="copyUrl" msgid="6229645005987260230">"URL мекенжайын көшіру"</string>

    <string name="selectTextMode" msgid="3225108910999318778">"Мәтінді бөлектеу"</string>

    <string name="selectTextMode" msgid="3225108910999318778">"Мәтінді ерекшелеу"</string>

    <string name="undo" msgid="3175318090002654673">"Қайтару"</string>

    <string name="redo" msgid="7231448494008532233">"Қайтару"</string>

    <string name="autofill" msgid="511224882647795296">"Aвтотолтыру"</string>

core/res/res/values-ky/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1234,7 +1234,7 @@ 
    <string name="smv_process" msgid="1398801497130695446">"<xliff:g id="PROCESS">%1$s</xliff:g> процесси өзүнүн мажбурланган StrictMode саясатын бузуп койду."</string>

    <string name="android_upgrading_title" product="default" msgid="7279077384220829683">"Телефон жаңырууда…"</string>

    <string name="android_upgrading_title" product="tablet" msgid="4268417249079938805">"Планшет жаңыртылууда…"</string>

    <string name="android_upgrading_title" product="device" msgid="6774767702998149762">"Түзмөк жаңыртылууда…"</string>

    <string name="android_upgrading_title" product="device" msgid="6774767702998149762">"Түзмөк жаңырууда…"</string>

    <string name="android_start_title" product="default" msgid="4036708252778757652">"Телефон күйгүзүлүүдө…"</string>

    <string name="android_start_title" product="automotive" msgid="7917984412828168079">"Android жүргүзүлүүдө…"</string>

    <string name="android_start_title" product="tablet" msgid="4429767260263190344">"Планшет күйгүзүлүүдө…"</string>

core/res/res/values-ml/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
    <string name="invalidPin" msgid="7542498253319440408">"4 മുതൽ 8 വരെ അക്കങ്ങളുള്ള ഒരു പിൻ ടൈപ്പുചെയ്യുക."</string>

    <string name="invalidPuk" msgid="8831151490931907083">"എട്ടോ അതിലധികമോ അക്കങ്ങളുള്ള ഒരു PUK ടൈപ്പുചെയ്യുക."</string>

    <string name="needPuk" msgid="7321876090152422918">"നിങ്ങളുടെ സിം കാർഡ് PUK ലോക്ക് ചെയ്‌തതാണ്. ഇത് അൺലോക്ക് ചെയ്യാൻ PUK കോഡ് ടൈപ്പുചെയ്യുക."</string>

    <string name="needPuk2" msgid="7032612093451537186">"സിം കാർഡ് തടഞ്ഞത് മാറ്റാൻ PUK2 ടൈപ്പുചെയ്യുക."</string>

    <string name="needPuk2" msgid="7032612093451537186">"സിം കാർഡ് അൺബ്ലോക്ക് ചെയ്യാൻ PUK2 ടൈപ്പ് ചെയ്യുക."</string>

    <string name="enablePin" msgid="2543771964137091212">"വിജയകരമല്ല, സിം/RUIM ലോക്ക് പ്രവർത്തനക്ഷമമാക്കുക."</string>

    <plurals name="pinpuk_attempts" formatted="false" msgid="1619867269012213584">

      <item quantity="other">SIM ലോക്കാകുന്നതിന് മുമ്പായി നിങ്ങൾക്ക് <xliff:g id="NUMBER_1">%d</xliff:g> ശ്രമങ്ങൾ കൂടി ശേഷിക്കുന്നു.</item>