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

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

Merge cherrypicks of [4027705, 4027707, 4027735, 4027736, 4026840, 4025434,... 

Merge cherrypicks of [4027705, 4027707, 4027735, 4027736, 4026840, 4025434, 4027755, 4025350, 4025351, 4025352, 4027737, 4027738, 4027660, 4027661, 4027663, 4027665, 4027102, 4027103, 4027104, 4027105, 4027106, 4027717, 4027718, 4027756, 4025353, 4027710, 4027711, 4027712, 4027713, 4027714, 4027795, 4027796, 4027797, 4027798, 4027757, 4027758, 4027799, 4027800, 4026842, 4027667, 4027668, 4027669] into sparse-4732990-L09800000171085564

Change-Id: I823b36ee3ed7d36b4db713487a105db7c84edd54
parents 4302e839 138d77aa

core/java/android/app/ActivityManagerInternal.java

+5 −0
Original line number Original line Diff line number Diff line
@@ -268,4 +268,9 @@ public abstract class ActivityManagerInternal { 
     * @param token The IApplicationToken for the activity

     * @param token The IApplicationToken for the activity

     */

     */

    public abstract void setFocusedActivity(IBinder token);

    public abstract void setFocusedActivity(IBinder token);



    /**

     * Returns {@code true} if {@code uid} is running an activity from {@code packageName}.

     */

    public abstract boolean hasRunningActivity(int uid, @Nullable String packageName);

}
 
}

core/java/android/os/Parcel.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -1340,6 +1340,13 @@ public final class Parcel { 
     * @see Parcelable

     * @see Parcelable

     */

     */

    public final <T extends Parcelable> void writeTypedList(List<T> val) {

    public final <T extends Parcelable> void writeTypedList(List<T> val) {

        writeTypedList(val, 0);

    }



    /**

     * @hide

     */

    public <T extends Parcelable> void writeTypedList(List<T> val, int parcelableFlags) {

        if (val == null) {

        if (val == null) {

            writeInt(-1);

            writeInt(-1);

            return;

            return;
@@ -1348,13 +1355,7 @@ public final class Parcel { 
        int i=0;

        int i=0;

        writeInt(N);

        writeInt(N);

        while (i < N) {

        while (i < N) {

            T item = val.get(i);

            writeTypedObject(val.get(i), parcelableFlags);

            if (item != null) {

                writeInt(1);

                item.writeToParcel(this, 0);

            } else {

                writeInt(0);

            }

            i++;

            i++;

        }

        }

    }

    }

core/java/android/provider/MediaStore.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -694,8 +694,8 @@ public final class MediaStore { 
            // Log.v(TAG, "getThumbnail: origId="+origId+", kind="+kind+", isVideo="+isVideo);

            // Log.v(TAG, "getThumbnail: origId="+origId+", kind="+kind+", isVideo="+isVideo);

            // If the magic is non-zero, we simply return thumbnail if it does exist.

            // If the magic is non-zero, we simply return thumbnail if it does exist.

            // querying MediaProvider and simply return thumbnail.

            // querying MediaProvider and simply return thumbnail.

            MiniThumbFile thumbFile = new MiniThumbFile(isVideo ? Video.Media.EXTERNAL_CONTENT_URI

            MiniThumbFile thumbFile = MiniThumbFile.instance(

                    : Images.Media.EXTERNAL_CONTENT_URI);

                    isVideo ? Video.Media.EXTERNAL_CONTENT_URI : Images.Media.EXTERNAL_CONTENT_URI);

            Cursor c = null;

            Cursor c = null;

            try {

            try {

                long magic = thumbFile.getMagic(origId);

                long magic = thumbFile.getMagic(origId);

core/java/android/service/autofill/Dataset.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -316,8 +316,8 @@ public final class Dataset implements Parcelable { 
    @Override

    @Override

    public void writeToParcel(Parcel parcel, int flags) {

    public void writeToParcel(Parcel parcel, int flags) {

        parcel.writeParcelable(mPresentation, flags);

        parcel.writeParcelable(mPresentation, flags);

        parcel.writeTypedArrayList(mFieldIds, flags);

        parcel.writeTypedList(mFieldIds, flags);

        parcel.writeTypedArrayList(mFieldValues, flags);

        parcel.writeTypedList(mFieldValues, flags);

        parcel.writeParcelableList(mFieldPresentations, flags);

        parcel.writeParcelableList(mFieldPresentations, flags);

        parcel.writeParcelable(mAuthentication, flags);

        parcel.writeParcelable(mAuthentication, flags);

        parcel.writeString(mId);

        parcel.writeString(mId);
@@ -333,8 +333,9 @@ public final class Dataset implements Parcelable { 
            final Builder builder = (presentation == null)

            final Builder builder = (presentation == null)

                    ? new Builder()

                    ? new Builder()

                    : new Builder(presentation);

                    : new Builder(presentation);

            final ArrayList<AutofillId> ids = parcel.readTypedArrayList(null);

            final ArrayList<AutofillId> ids = parcel.createTypedArrayList(AutofillId.CREATOR);

            final ArrayList<AutofillValue> values = parcel.readTypedArrayList(null);

            final ArrayList<AutofillValue> values =

                    parcel.createTypedArrayList(AutofillValue.CREATOR);

            final ArrayList<RemoteViews> presentations = new ArrayList<>();

            final ArrayList<RemoteViews> presentations = new ArrayList<>();

            parcel.readParcelableList(presentations, null);

            parcel.readParcelableList(presentations, null);

            final int idCount = (ids != null) ? ids.size() : 0;

            final int idCount = (ids != null) ? ids.size() : 0;

core/java/android/service/autofill/SaveRequest.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -19,9 +19,9 @@ package android.service.autofill; 
import android.annotation.NonNull;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.os.Bundle;

import android.os.Bundle;

import android.os.CancellationSignal;

import android.os.Parcel;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.Parcelable;



import com.android.internal.util.Preconditions;

import com.android.internal.util.Preconditions;





import java.util.ArrayList;

import java.util.ArrayList;
@@ -45,7 +45,7 @@ public final class SaveRequest implements Parcelable { 
    }

    }





    private SaveRequest(@NonNull Parcel parcel) {

    private SaveRequest(@NonNull Parcel parcel) {

        this(parcel.readTypedArrayList(null), parcel.readBundle());

        this(parcel.createTypedArrayList(FillContext.CREATOR), parcel.readBundle());

    }

    }





    /**

    /**
@@ -57,7 +57,7 @@ public final class SaveRequest implements Parcelable { 




    /**

    /**

     * Gets the extra client state returned from the last {@link

     * Gets the extra client state returned from the last {@link

     * AutofillService#onFillRequest(FillRequest, CancellationSignal, FillCallback)}

     * AutofillService#onFillRequest(FillRequest, android.os.CancellationSignal, FillCallback)}

     * fill request}.

     * fill request}.

     *

     *

     * @return The client state.

     * @return The client state.
@@ -73,7 +73,7 @@ public final class SaveRequest implements Parcelable { 




    @Override

    @Override

    public void writeToParcel(Parcel parcel, int flags) {

    public void writeToParcel(Parcel parcel, int flags) {

        parcel.writeTypedArrayList(mFillContexts, flags);

        parcel.writeTypedList(mFillContexts, flags);

        parcel.writeBundle(mClientState);

        parcel.writeBundle(mClientState);

    }

    }