Merge "Lock screen LWP: adds information to `dumpsys wallpaper`" (9ada2918) · Commits · e / os / android_frameworks_base

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

+54 −79

Original line number	Diff line number	Diff line
		@@ -3986,19 +3986,11 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		args, callback, resultReceiver);
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

		pw.print("mDefaultWallpaperComponent="); pw.println(mDefaultWallpaperComponent);
		pw.print("mImageWallpaper="); pw.println(mImageWallpaper);

		synchronized (mLock) {
		pw.println("System wallpaper state:");
		for (int i = 0; i < mWallpaperMap.size(); i++) {
		WallpaperData wallpaper = mWallpaperMap.valueAt(i);
		private void dumpWallpaper(WallpaperData wallpaper, PrintWriter pw) {
		pw.print(" User "); pw.print(wallpaper.userId);
		pw.print(": id="); pw.println(wallpaper.wallpaperId);
		pw.print(": id="); pw.print(wallpaper.wallpaperId);
		pw.print(": mWhich="); pw.print(wallpaper.mWhich);
		pw.print(": mSystemWasBoth="); pw.println(wallpaper.mSystemWasBoth);
		pw.println(" Display state:");
		mWallpaperDisplayHelper.forEachDisplayData(wpSize -> {
		pw.print(" displayId=");
		@@ -4043,43 +4035,26 @@ public class WallpaperManagerService extends IWallpaperManager.Stub
		pw.println(wallpaper.lastDiedTime - SystemClock.uptimeMillis());
		}
		}

		@Override
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

		pw.print("mDefaultWallpaperComponent="); pw.println(mDefaultWallpaperComponent);
		pw.print("mImageWallpaper="); pw.println(mImageWallpaper);

		synchronized (mLock) {
		pw.println("System wallpaper state:");
		for (int i = 0; i < mWallpaperMap.size(); i++) {
		dumpWallpaper(mWallpaperMap.valueAt(i), pw);
		}
		pw.println("Lock wallpaper state:");
		for (int i = 0; i < mLockWallpaperMap.size(); i++) {
		WallpaperData wallpaper = mLockWallpaperMap.valueAt(i);
		pw.print(" User "); pw.print(wallpaper.userId);
		pw.print(": id="); pw.println(wallpaper.wallpaperId);
		pw.print(" mCropHint="); pw.println(wallpaper.cropHint);
		pw.print(" mName="); pw.println(wallpaper.name);
		pw.print(" mAllowBackup="); pw.println(wallpaper.allowBackup);
		pw.print(" mWallpaperDimAmount="); pw.println(wallpaper.mWallpaperDimAmount);
		dumpWallpaper(mLockWallpaperMap.valueAt(i), pw);
		}
		pw.println("Fallback wallpaper state:");
		pw.print(" User "); pw.print(mFallbackWallpaper.userId);
		pw.print(": id="); pw.println(mFallbackWallpaper.wallpaperId);
		pw.print(" mCropHint="); pw.println(mFallbackWallpaper.cropHint);
		pw.print(" mName="); pw.println(mFallbackWallpaper.name);
		pw.print(" mAllowBackup="); pw.println(mFallbackWallpaper.allowBackup);
		if (mFallbackWallpaper.connection != null) {
		WallpaperConnection conn = mFallbackWallpaper.connection;
		pw.print(" Fallback Wallpaper connection ");
		pw.print(conn);
		pw.println(":");
		if (conn.mInfo != null) {
		pw.print(" mInfo.component=");
		pw.println(conn.mInfo.getComponent());
		}
		conn.forEachDisplayConnector(connector -> {
		pw.print(" mDisplayId=");
		pw.println(connector.mDisplayId);
		pw.print(" mToken=");
		pw.println(connector.mToken);
		pw.print(" mEngine=");
		pw.println(connector.mEngine);
		});
		pw.print(" mService=");
		pw.println(conn.mService);
		pw.print(" mLastDiedTime=");
		pw.println(mFallbackWallpaper.lastDiedTime - SystemClock.uptimeMillis());
		if (mFallbackWallpaper != null) {
		dumpWallpaper(mFallbackWallpaper, pw);
		}
		}
		}