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

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

Snap for 5706892 from 5540281a to qt-release 

Change-Id: I854cf5b9fa717b6c0910ea28bda9d7b0ea960ca4
parents e928d0b1 5540281a

core/java/android/app/servertransaction/NewIntentItem.java

+11 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.app.servertransaction;



import static android.app.servertransaction.ActivityLifecycleItem.ON_RESUME;

import static android.app.servertransaction.ActivityLifecycleItem.UNDEFINED;



import android.annotation.UnsupportedAppUsage;

import android.app.ClientTransactionHandler;
@@ -38,10 +39,11 @@ public class NewIntentItem extends ClientTransactionItem { 


    @UnsupportedAppUsage

    private List<ReferrerIntent> mIntents;

    private boolean mResume;



    @Override

    public int getPostExecutionState() {

        return ON_RESUME;

        return mResume ? ON_RESUME : UNDEFINED;

    }



    @Override
@@ -58,12 +60,13 @@ public class NewIntentItem extends ClientTransactionItem { 
    private NewIntentItem() {}



    /** Obtain an instance initialized with provided params. */

    public static NewIntentItem obtain(List<ReferrerIntent> intents) {

    public static NewIntentItem obtain(List<ReferrerIntent> intents, boolean resume) {

        NewIntentItem instance = ObjectPool.obtain(NewIntentItem.class);

        if (instance == null) {

            instance = new NewIntentItem();

        }

        instance.mIntents = intents;

        instance.mResume = resume;



        return instance;

    }
@@ -71,6 +74,7 @@ public class NewIntentItem extends ClientTransactionItem { 
    @Override

    public void recycle() {

        mIntents = null;

        mResume = false;

        ObjectPool.recycle(this);

    }
@@ -80,11 +84,13 @@ public class NewIntentItem extends ClientTransactionItem { 
    /** Write to Parcel. */

    @Override

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeBoolean(mResume);

        dest.writeTypedList(mIntents, flags);

    }



    /** Read from Parcel. */

    private NewIntentItem(Parcel in) {

        mResume = in.readBoolean();

        mIntents = in.createTypedArrayList(ReferrerIntent.CREATOR);

    }
@@ -108,18 +114,19 @@ public class NewIntentItem extends ClientTransactionItem { 
            return false;

        }

        final NewIntentItem other = (NewIntentItem) o;

        return Objects.equals(mIntents, other.mIntents);

        return mResume == other.mResume && Objects.equals(mIntents, other.mIntents);

    }



    @Override

    public int hashCode() {

        int result = 17;

        result = 31 * result + (mResume ? 1 : 0);

        result = 31 * result + mIntents.hashCode();

        return result;

    }



    @Override

    public String toString() {

        return "NewIntentItem{intents=" + mIntents + "}";

        return "NewIntentItem{intents=" + mIntents + ",resume=" + mResume + "}";

    }

}

core/java/com/android/internal/app/ResolverActivity.java

+2 −1
Original line number Diff line number Diff line
@@ -889,7 +889,8 @@ public class ResolverActivity extends Activity { 
                : mAdapterView.getCheckedItemPosition();

        boolean hasIndexBeenFiltered = !mAdapter.hasFilteredItem();

        ResolveInfo ri = mAdapter.resolveInfoForPosition(which, hasIndexBeenFiltered);

        if (!ri.handleAllWebDataURI && id == R.id.button_always) {

        if (mUseLayoutForBrowsables

                && !ri.handleAllWebDataURI && id == R.id.button_always) {

            showSettingsForSelected(ri);

        } else {

            startSelected(which, id == R.id.button_always, hasIndexBeenFiltered);

core/java/com/android/internal/os/ZygoteInit.java

+0 −7
Original line number Diff line number Diff line
@@ -188,13 +188,6 @@ public class ZygoteInit { 
        System.loadLibrary("android");

        System.loadLibrary("compiler_rt");

        System.loadLibrary("jnigraphics");



        // tolerate missing sfplugin_ccodec which is only present on Codec 2 devices

        try {

            System.loadLibrary("sfplugin_ccodec");

        } catch (Error | RuntimeException e) {

            Log.w(TAG, "Problem preloading sfplugin_ccodec: " + e);

        }

    }



    native private static void nativePreloadAppProcessHALs();

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

+5 −10
Original line number Diff line number Diff line
@@ -1130,14 +1130,10 @@ 
    <string name="whichViewApplication" msgid="3272778576700572102">"Maak oop met"</string>

    <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Maak oop met %1$s"</string>

    <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Maak oop"</string>

    <!-- no translation found for whichOpenHostLinksWith (3788174881117226583) -->

    <skip />

    <!-- no translation found for whichOpenLinksWith (6392123355599572804) -->

    <skip />

    <!-- no translation found for whichOpenLinksWithApp (8225991685366651614) -->

    <skip />

    <!-- no translation found for whichOpenHostLinksWithApp (3464470639011045589) -->

    <skip />

    <string name="whichOpenHostLinksWith" msgid="3788174881117226583">"Maak <xliff:g id="HOST">%1$s</xliff:g>-skakels oop met"</string>

    <string name="whichOpenLinksWith" msgid="6392123355599572804">"Maak skakels oop met"</string>

    <string name="whichOpenLinksWithApp" msgid="8225991685366651614">"Maak skakels oop met <xliff:g id="APPLICATION">%1$s</xliff:g>"</string>

    <string name="whichOpenHostLinksWithApp" msgid="3464470639011045589">"Maak <xliff:g id="HOST">%1$s</xliff:g>-skakels oop met <xliff:g id="APPLICATION">%2$s</xliff:g>"</string>

    <string name="whichGiveAccessToApplicationLabel" msgid="6142688895536868827">"Verleen toegang"</string>

    <string name="whichEditApplication" msgid="144727838241402655">"Redigeer met"</string>

    <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redigeer met %1$s"</string>
@@ -1589,8 +1585,7 @@ 
    <string name="launchBrowserDefault" msgid="2057951947297614725">"Begin webblaaier?"</string>

    <string name="SetupCallDefault" msgid="5834948469253758575">"Aanvaar oproep?"</string>

    <string name="activity_resolver_use_always" msgid="8017770747801494933">"Altyd"</string>

    <!-- no translation found for activity_resolver_set_always (1422574191056490585) -->

    <skip />

    <string name="activity_resolver_set_always" msgid="1422574191056490585">"Stel om altyd oop te maak"</string>

    <string name="activity_resolver_use_once" msgid="2404644797149173758">"Net een keer"</string>

    <string name="activity_resolver_app_settings" msgid="8965806928986509855">"Instellings"</string>

    <string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"%1$s steun nie werkprofiel nie"</string>

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

+5 −10
Original line number Diff line number Diff line
@@ -1130,14 +1130,10 @@ 
    <string name="whichViewApplication" msgid="3272778576700572102">"ክፈት በ"</string>

    <string name="whichViewApplicationNamed" msgid="2286418824011249620">"ክፈት በ%1$s"</string>

    <string name="whichViewApplicationLabel" msgid="2666774233008808473">"ክፈት"</string>

    <!-- no translation found for whichOpenHostLinksWith (3788174881117226583) -->

    <skip />

    <!-- no translation found for whichOpenLinksWith (6392123355599572804) -->

    <skip />

    <!-- no translation found for whichOpenLinksWithApp (8225991685366651614) -->

    <skip />

    <!-- no translation found for whichOpenHostLinksWithApp (3464470639011045589) -->

    <skip />

    <string name="whichOpenHostLinksWith" msgid="3788174881117226583">"<xliff:g id="HOST">%1$s</xliff:g> አገናኞችን ክፈት ከዚህ ጋር"</string>

    <string name="whichOpenLinksWith" msgid="6392123355599572804">"አገናኞችን ክፈት ከዚህ ጋር"</string>

    <string name="whichOpenLinksWithApp" msgid="8225991685366651614">"አገናኞችን ከ <xliff:g id="APPLICATION">%1$s</xliff:g> ጋር ክፈት"</string>

    <string name="whichOpenHostLinksWithApp" msgid="3464470639011045589">"<xliff:g id="HOST">%1$s</xliff:g> አገናኞችን ከ <xliff:g id="APPLICATION">%2$s</xliff:g> ጋር ክፈት"</string>

    <string name="whichGiveAccessToApplicationLabel" msgid="6142688895536868827">"መዳረሻ ስጥ"</string>

    <string name="whichEditApplication" msgid="144727838241402655">"ያርትዑ በ"</string>

    <string name="whichEditApplicationNamed" msgid="1775815530156447790">"ያርትዑ በ%1$s"</string>
@@ -1589,8 +1585,7 @@ 
    <string name="launchBrowserDefault" msgid="2057951947297614725">"ማሰሺያን አስነሳ?"</string>

    <string name="SetupCallDefault" msgid="5834948469253758575">"ጥሪ ተቀበል?"</string>

    <string name="activity_resolver_use_always" msgid="8017770747801494933">"ዘወትር"</string>

    <!-- no translation found for activity_resolver_set_always (1422574191056490585) -->

    <skip />

    <string name="activity_resolver_set_always" msgid="1422574191056490585">"ሁልጊዜ ክፍት ወደ የሚል ተቀናብሯል"</string>

    <string name="activity_resolver_use_once" msgid="2404644797149173758">"አንዴ ብቻ"</string>

    <string name="activity_resolver_app_settings" msgid="8965806928986509855">"ቅንብሮች"</string>

    <string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"%1$s የስራ መገለጫ አይደግፍም"</string>