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

Commit e1db6015 authored by Sam Mortimer's avatar Sam Mortimer
Browse files

Merge tag 'android-8.1.0_r30' into lineage-15.1 

Android 8.1.0 release 30

# gpg: Signature made Mon 04 Jun 2018 10:23:42 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found

* tag 'android-8.1.0_r30':
  DO NOT MERGE (O) Revoke permision when group changed
  ResStringPool: Fix security vulnerability
  Use concrete CREATOR instance for parceling lists
  Rework thumbnail cleanup
  Proper autofill fix to let phone process autofill Settings activity.
  Fixed Security Vulnerability of DcParamObject
  Update internal ViewPager's SavedState to match Support Library version
  [DO NOT MERGE] Copy PermissionChecker from support lib and use in RcognitionService
  [DO NOT MERGE] Add permission check to setAllowOnlyVpnForUids
  Verify last array's length in readFromParcel
  DO NOT MERGE - fix AFM.getComponentNameFromContext()
  Make sure apps cannot forge package name on AssistStructure used for Autofill.
parents c1b1071f 9e8f9c8a

core/java/android/app/Activity.java

+10 −0
Original line number Diff line number Diff line
@@ -5871,6 +5871,16 @@ public class Activity extends ContextThemeWrapper 
        return mComponent;

    }



    /**

     * Temporary method on O-MR1 only.

     *

     * @hide

     */

    @Override

    public ComponentName getComponentNameForAutofill() {

        return mComponent;

    }



    /**

     * Retrieve a {@link SharedPreferences} object for accessing preferences

     * that are private to this activity.  This simply calls the underlying

core/java/android/app/ActivityManagerInternal.java

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

     */

    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/app/assist/AssistStructure.java

+10 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,16 @@ public class AssistStructure implements Parcelable { 
        return mActivityComponent;

    }



    /**

     * Called by Autofill server when app forged a different value.

     *

     * @hide

     */

    public void setActivityComponent(ComponentName componentName) {

        ensureData();

        mActivityComponent = componentName;

    }



    /** @hide */

    public int getFlags() {

        return mFlags;

core/java/android/os/Parcel.java

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

     */

    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) {

            writeInt(-1);

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

        writeInt(N);

        while (i < N) {

            T item = val.get(i);

            if (item != null) {

                writeInt(1);

                item.writeToParcel(this, 0);

            } else {

                writeInt(0);

            }

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

            i++;

        }

    }

core/java/android/provider/MediaStore.java

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

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

            // querying MediaProvider and simply return thumbnail.

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

                    : Images.Media.EXTERNAL_CONTENT_URI);

            MiniThumbFile thumbFile = MiniThumbFile.instance(

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

            Cursor c = null;

            try {

                long magic = thumbFile.getMagic(origId);