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

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

release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-436... 

release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4367109 snap-temp-L18300000107415568

Change-Id: I8396e58a619b2e1e40903d3e1edda40f766759ff
parents 38f60ad6 2bc6acbf

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1524,6 +1525,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1660,6 +1661,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -919,6 +919,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1524,6 +1525,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

core/java/android/animation/AnimatorSet.java

+3 −2
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
        // Assumes forward playing from here on.

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

            AnimationEvent event = mEvents.get(i);

            if (event.getTime() > currentPlayTime) {

            if (event.getTime() > currentPlayTime || event.getTime() == DURATION_INFINITE) {

                break;

            }
@@ -1264,7 +1264,8 @@ public final class AnimatorSet extends Animator implements AnimationHandler.Anim 
        } else {

            for (int i = mLastEventId + 1; i < size; i++) {

                AnimationEvent event = mEvents.get(i);

                if (event.getTime() <= currentPlayTime) {

                // TODO: need a function that accounts for infinite duration to compare time

                if (event.getTime() != DURATION_INFINITE && event.getTime() <= currentPlayTime) {

                    latestId = i;

                }

            }

core/java/android/app/ActivityManagerInternal.java

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ public abstract class ActivityManagerInternal { 
    /**

     * Allow DeviceIdleController to tell us about what apps are whitelisted.

     */

    public abstract void setDeviceIdleWhitelist(int[] userAppids, int[] allAppids);

    public abstract void setDeviceIdleWhitelist(int[] appids);



    /**

     * Update information about which app IDs are on the temp whitelist.