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

Commit 74aa0b57 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Use newest scrap view in ListView" into oc-dev am: ecc0e16e 

am: e04b73c9

Change-Id: I931f0317d495e6bc971f1ac4fc02ea0c20b19cf3
parents cb6990b3 e04b73c9

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ package android { 
    field public static final int ratingBarStyleSmall = 16842877; // 0x101007d

    field public static final int readPermission = 16842759; // 0x1010007

    field public static final int recognitionService = 16843932; // 0x101049c

    field public static final int recreateOnConfigChanges = 16844105; // 0x1010549

    field public static final int recycleEnabled = 16844124; // 0x101055c

    field public static final int relinquishTaskIdentity = 16843894; // 0x1010476

    field public static final int reparent = 16843964; // 0x10104bc
@@ -1085,7 +1086,6 @@ package android { 
    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restartOnConfigChanges = 16844105; // 0x1010549

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int restrictedAccountType = 16843733; // 0x10103d5

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1182,6 +1182,7 @@ package android { 
    field public static final int ratingBarStyleSmall = 16842877; // 0x101007d

    field public static final int readPermission = 16842759; // 0x1010007

    field public static final int recognitionService = 16843932; // 0x101049c

    field public static final int recreateOnConfigChanges = 16844105; // 0x1010549

    field public static final int recycleEnabled = 16844124; // 0x101055c

    field public static final int relinquishTaskIdentity = 16843894; // 0x1010476

    field public static final int reparent = 16843964; // 0x10104bc
@@ -1208,7 +1209,6 @@ package android { 
    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restartOnConfigChanges = 16844105; // 0x1010549

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int restrictedAccountType = 16843733; // 0x10103d5

api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1061,6 +1061,7 @@ package android { 
    field public static final int ratingBarStyleSmall = 16842877; // 0x101007d

    field public static final int readPermission = 16842759; // 0x1010007

    field public static final int recognitionService = 16843932; // 0x101049c

    field public static final int recreateOnConfigChanges = 16844105; // 0x1010549

    field public static final int recycleEnabled = 16844124; // 0x101055c

    field public static final int relinquishTaskIdentity = 16843894; // 0x1010476

    field public static final int reparent = 16843964; // 0x10104bc
@@ -1085,7 +1086,6 @@ package android { 
    field public static final int resizeable = 16843405; // 0x101028d

    field public static final int resizeableActivity = 16844022; // 0x10104f6

    field public static final int resource = 16842789; // 0x1010025

    field public static final int restartOnConfigChanges = 16844105; // 0x1010549

    field public static final int restoreAnyVersion = 16843450; // 0x10102ba

    field public static final deprecated int restoreNeedsApplication = 16843421; // 0x101029d

    field public static final int restrictedAccountType = 16843733; // 0x10103d5

core/java/android/content/pm/PackageParser.java

+7 −7
Original line number Diff line number Diff line
@@ -201,10 +201,10 @@ public class PackageParser { 
    private static final String META_DATA_INSTANT_APPS = "instantapps.clients.allowed";



    /**

     * Bit mask of all the valid bits that can be set in restartOnConfigChanges.

     * Bit mask of all the valid bits that can be set in recreateOnConfigChanges.

     * @hide

     */

    private static final int RESTART_ON_CONFIG_CHANGES_MASK =

    private static final int RECREATE_ON_CONFIG_CHANGES_MASK =

            ActivityInfo.CONFIG_MCC | ActivityInfo.CONFIG_MNC;



    // These are the tags supported by child packages
@@ -4219,7 +4219,7 @@ public class PackageParser { 
                    ActivityManager.getDefaultAppRecentsLimitStatic());

            a.info.configChanges = getActivityConfigChanges(

                    sa.getInt(R.styleable.AndroidManifestActivity_configChanges, 0),

                    sa.getInt(R.styleable.AndroidManifestActivity_restartOnConfigChanges, 0));

                    sa.getInt(R.styleable.AndroidManifestActivity_recreateOnConfigChanges, 0));

            a.info.softInputMode = sa.getInt(

                    R.styleable.AndroidManifestActivity_windowSoftInputMode, 0);
@@ -4523,13 +4523,13 @@ public class PackageParser { 


    /**

     * @param configChanges The bit mask of configChanges fetched from AndroidManifest.xml.

     * @param restartOnConfigChanges The bit mask restartOnConfigChanges fetched from

     * @param recreateOnConfigChanges The bit mask recreateOnConfigChanges fetched from

     *                                AndroidManifest.xml.

     * @hide Exposed for unit testing only.

     */

    @TestApi

    public static int getActivityConfigChanges(int configChanges, int restartOnConfigChanges) {

        return configChanges | ((~restartOnConfigChanges) & RESTART_ON_CONFIG_CHANGES_MASK);

    public static int getActivityConfigChanges(int configChanges, int recreateOnConfigChanges) {

        return configChanges | ((~recreateOnConfigChanges) & RECREATE_ON_CONFIG_CHANGES_MASK);

    }



    private void parseLayout(Resources res, AttributeSet attrs, Activity a) {

core/java/android/widget/AbsListView.java

+2 −1
Original line number Diff line number Diff line
@@ -7088,7 +7088,8 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te 
            final int size = scrapViews.size();

            if (size > 0) {

                // See if we still have a view for this position or ID.

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

                // Traverse backwards to find the most recently used scrap view

                for (int i = size - 1; i >= 0; i--) {

                    final View view = scrapViews.get(i);

                    final AbsListView.LayoutParams params =

                            (AbsListView.LayoutParams) view.getLayoutParams();