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

Commit a9fcb6f7 authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Update local wallpaper colors when areas added and fix stale clock"... 

Merge "Update local wallpaper colors when areas added and fix stale clock" into sc-v2-dev am: b9902adf am: f580a5d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15983695

Change-Id: I6209cfaf12a46ab8f294d8ce3f4a628bb693acdb
parents 1f2b98c6 f580a5d4

core/java/android/service/wallpaper/WallpaperService.java

+2 −1
Original line number Diff line number Diff line
@@ -1575,7 +1575,7 @@ public abstract class WallpaperService extends Service { 
        void updatePage(EngineWindowPage currentPage, int pageIndx, int numPages,

                float xOffsetStep) {

            // to save creating a runnable, check twice

            long current = SystemClock.elapsedRealtime();

            long current = System.currentTimeMillis();

            long lapsed = current - currentPage.getLastUpdateTime();

            // Always update the page when the last update time is <= 0

            // This is important especially when the device first boots
@@ -1768,6 +1768,7 @@ public abstract class WallpaperService extends Service { 
                    return;

                }

            }

            processLocalColors(mPendingXOffset, mPendingYOffset);

        }



        /**