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

Commit b0a9462b authored Nov 01, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Nov 01, 2022

Merge "Add logs for wallpaper set completion" into tm-qpr-dev am: e91f8da4

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

Change-Id: Ie291947b6c9cfa2c449065be03b47e1b97d87454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 5443c8c7 e91f8da4

core/java/android/app/WallpaperManager.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -2458,7 +2458,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

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -578,6 +578,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);

services/core/java/com/android/server/wallpaper/WallpaperManagerService.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -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!");
		}
		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;
		}