Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1fd7c92d5862a2e35fe6749b13488577a574d63f
This commit is contained in:
TreeHugger Robot
2021-09-24 02:45:05 +00:00
committed by Automerger Merge Worker
parent 78cb6529fc 6ef0aae53b
commit a793d7a0e3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/service/wallpaper/WallpaperService.java
View File

@@ -548,12 +548,16 @@ public abstract class WallpaperService extends Service {
*/ */
public void reportEngineShown(boolean waitForEngineShown) { public void reportEngineShown(boolean waitForEngineShown) {
if (mIWallpaperEngine.mShownReported) return; if (mIWallpaperEngine.mShownReported) return;
Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN);
if (!waitForEngineShown) { if (!waitForEngineShown) {
Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN);
mCaller.removeMessages(MSG_REPORT_SHOWN); mCaller.removeMessages(MSG_REPORT_SHOWN);
mCaller.sendMessage(message); mCaller.sendMessage(message);
} else { } 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));
}
} }
} }
@@ -2078,6 +2082,8 @@ public abstract class WallpaperService extends Service {
mShownReported = true; mShownReported = true;
try { try {
mConnection.engineShown(this); mConnection.engineShown(this);
Log.d(TAG, "Wallpaper has updated the surface:"
+ mWallpaperManager.getWallpaperInfo());
} catch (RemoteException e) { } catch (RemoteException e) {
Log.w(TAG, "Wallpaper host disappeared", e); Log.w(TAG, "Wallpaper host disappeared", e);
return; return;