diff options
| author | 2022-11-01 05:55:18 +0000 | |
|---|---|---|
| committer | 2022-11-01 05:55:18 +0000 | |
| commit | 59231384d23606a545c0225d5b923dcade67d06d (patch) | |
| tree | 1bd3c15180ca6d5a9c020107978726fee446247b | |
| parent | 422c5326d8925aa55d3c14ff18f2159d71c701e2 (diff) | |
| parent | b0a9462be110a84df2a8c0d69becde46e45b7422 (diff) | |
Merge "Add logs for wallpaper set completion" into tm-qpr-dev am: e91f8da432 am: b0a9462be1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291664
Change-Id: Ieb7a673f14580c72fc9f22455bf00c998b4340b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 9 insertions, 4 deletions
diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 95e9c22373de..5e15b0a19a6a 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -2456,7 +2456,12 @@ public class WallpaperManager { public void waitForCompletion() { try { - mLatch.await(30, TimeUnit.SECONDS); + final boolean completed = mLatch.await(30, TimeUnit.SECONDS); + if (completed) { + Log.d(TAG, "Wallpaper set completion."); + } else { + Log.d(TAG, "Timeout waiting for wallpaper set completion!"); + } } catch (InterruptedException e) { // This might be legit: the crop may take a very long time. Don't sweat // it in that case; we are okay with display lagging behind in order to diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index c6cd708c5967..37fc9f288c3e 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -575,6 +575,7 @@ public abstract class WallpaperService extends Service { */ public void reportEngineShown(boolean waitForEngineShown) { if (mIWallpaperEngine.mShownReported) return; + Log.d(TAG, "reportEngineShown: shouldWait=" + waitForEngineShown); if (!waitForEngineShown) { Message message = mCaller.obtainMessage(MSG_REPORT_SHOWN); mCaller.removeMessages(MSG_REPORT_SHOWN); diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index abb57bca3704..6a3553315e5a 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -320,9 +320,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub IRemoteCallback.Stub callback = new IRemoteCallback.Stub() { @Override public void sendResult(Bundle data) throws RemoteException { - if (DEBUG) { - Slog.d(TAG, "publish system wallpaper changed!"); - } + Slog.d(TAG, "publish system wallpaper changed!"); notifyWallpaperChanged(wallpaper); } }; @@ -1552,6 +1550,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub mReply.sendResult(null); } catch (RemoteException e) { Binder.restoreCallingIdentity(ident); + Slog.d(TAG, "failed to send callback!", e); } mReply = null; } |