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

Commit 78bd2539 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use longer timeout for reportShown call" into sc-qpr1-dev am: 6ef0aae5 

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

Change-Id: Ia14b9965db1ab345edcb8ce54e3ef60176908b1e
parents d1af9bd2 6ef0aae5

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

+8 −2
Original line number Diff line number Diff line
@@ -561,12 +561,16 @@ public abstract class WallpaperService extends Service { 
         */

        public void reportEngineShown(boolean waitForEngineShown) {

            if (mIWallpaperEngine.mShownReported) return;

            Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN);

            if (!waitForEngineShown) {

                Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN);

                mCaller.removeMessages(MSG_REPORT_SHOWN);

                mCaller.sendMessage(message);

            } else {

                mCaller.sendMessageDelayed(message, TimeUnit.SECONDS.toMillis(1));

                // if we are already waiting, no need to reset the timeout.

                if (!mCaller.hasMessages(MSG_REPORT_SHOWN)) {

                    Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN);

                    mCaller.sendMessageDelayed(message, TimeUnit.SECONDS.toMillis(5));

                }

            }

        }
@@ -2256,6 +2260,8 @@ public abstract class WallpaperService extends Service { 
                mShownReported = true;

                try {

                    mConnection.engineShown(this);

                    Log.d(TAG, "Wallpaper has updated the surface:"

                            + mWallpaperManager.getWallpaperInfo());

                } catch (RemoteException e) {

                    Log.w(TAG, "Wallpaper host disappeared", e);

                    return;