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

DO NOT MERGE Add debug log to trace wallpaper rendering

Browse Source 
Add some debug logs to trace black wallpaper issue.

Bug: 139487871
Test: Manually switch between app and home.
Test: Observe log.
Change-Id: I8a81f2c4f4b368d6140227308080a7a5a65eb376
This commit is contained in:
Ahan Wu
2019-10-04 11:59:10 +08:00
parent e548ea7764
commit 3573cdd4c8
3 changed files with 95 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
packages/SystemUI/src/com/android/systemui/ImageWallpaper.java
View File

@@ -20,6 +20,7 @@ import android.app.ActivityManager;
import android.content.Context;
import android.graphics.Rect;
import android.os.HandlerThread;
import android.os.Trace;
import android.service.wallpaper.WallpaperService;
import android.util.Log;
import android.util.Size;
@@ -48,6 +49,7 @@ public class ImageWallpaper extends WallpaperService {
private static final int DELAY_FINISH_RENDERING = 1000;
private static final int INTERVAL_WAIT_FOR_RENDERING = 100;
private static final int PATIENCE_WAIT_FOR_RENDERING = 10;
private static final boolean DEBUG = true;
private HandlerThread mWorker;
@Override
@@ -125,6 +127,10 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void onAmbientModeChanged(boolean inAmbientMode, long animationDuration) {
if (!mNeedTransition) return;
if (DEBUG) {
Log.d(TAG, "onAmbientModeChanged: inAmbient=" + inAmbientMode
+ ", duration=" + animationDuration);
}
mWorker.getThreadHandler().post(
() -> mRenderer.updateAmbientMode(inAmbientMode, animationDuration));
if (inAmbientMode && animationDuration == 0) {
@@ -177,6 +183,10 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
mWorker.getThreadHandler().post(() -> {
if (DEBUG) {
Log.d(TAG, "onSurfaceChanged: w=" + width + ", h=" + height);
}
mRenderer.onSurfaceChanged(width, height);
mNeedRedraw = true;
});
@@ -185,15 +195,30 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void onSurfaceRedrawNeeded(SurfaceHolder holder) {
mWorker.getThreadHandler().post(() -> {
if (DEBUG) {
Log.d(TAG, "onSurfaceRedrawNeeded: mNeedRedraw=" + mNeedRedraw);
}
if (mNeedRedraw) {
preRender();
requestRender();
postRender();
drawFrame();
mNeedRedraw = false;
}
});
}
@Override
public void onVisibilityChanged(boolean visible) {
if (DEBUG) {
Log.d(TAG, "wallpaper visibility changes to: " + visible);
}
}
private void drawFrame() {
preRender();
requestRender();
postRender();
}
@Override
public void onStatePostChange() {
// When back to home, we try to release EGL, which is preserved in lock screen or aod.
@@ -204,8 +229,18 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void preRender() {
if (DEBUG) {
Log.d(TAG, "preRender start");
}
// This method should only be invoked from worker thread.
Trace.beginSection("ImageWallpaper#preRender");
preRenderInternal();
Trace.endSection();
if (DEBUG) {
Log.d(TAG, "preRender end");
}
}
private void preRenderInternal() {
@@ -240,7 +275,9 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void requestRender() {
// This method should only be invoked from worker thread.
Trace.beginSection("ImageWallpaper#requestRender");
requestRenderInternal();
Trace.endSection();
}
private void requestRenderInternal() {
@@ -262,9 +299,19 @@ public class ImageWallpaper extends WallpaperService {
@Override
public void postRender() {
if (DEBUG) {
Log.d(TAG, "postRender start");
}
// This method should only be invoked from worker thread.
Trace.beginSection("ImageWallpaper#postRender");
notifyWaitingThread();
scheduleFinishRendering();
Trace.endSection();
if (DEBUG) {
Log.d(TAG, "postRender end");
}
}
private void notifyWaitingThread() {
@@ -289,12 +336,18 @@ public class ImageWallpaper extends WallpaperService {
}
private void finishRendering() {
if (DEBUG) {
Log.d(TAG, "finishRendering, preserve=" + needPreserveEglContext());
}
Trace.beginSection("ImageWallpaper#finishRendering");
if (mEglHelper != null) {
mEglHelper.destroyEglSurface();
if (!needPreserveEglContext()) {
mEglHelper.destroyEglContext();
}
}
Trace.endSection();
}
private boolean needPreserveEglContext() {

17
packages/SystemUI/src/com/android/systemui/glwallpaper/ImageRevealHelper.java
View File

@@ -19,6 +19,7 @@ package com.android.systemui.glwallpaper;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator;
import android.util.Log;
import com.android.systemui.Interpolators;
@@ -30,6 +31,7 @@ class ImageRevealHelper {
private static final String TAG = ImageRevealHelper.class.getSimpleName();
private static final float MAX_REVEAL = 0f;
private static final float MIN_REVEAL = 1f;
private static final boolean DEBUG = true;
private final ValueAnimator mAnimator;
private final RevealStateListener mRevealListener;
@@ -56,8 +58,13 @@ class ImageRevealHelper {
@Override
public void onAnimationEnd(Animator animation) {
if (!mIsCanceled && mRevealListener != null) {
mRevealListener.onRevealEnd();
if (mRevealListener != null) {
if (DEBUG) {
Log.d(TAG, "transition end, cancel=" + mIsCanceled + ", reveal=" + mReveal);
}
if (!mIsCanceled) {
mRevealListener.onRevealEnd();
}
}
mIsCanceled = false;
}
@@ -65,6 +72,9 @@ class ImageRevealHelper {
@Override
public void onAnimationStart(Animator animation) {
if (mRevealListener != null) {
if (DEBUG) {
Log.d(TAG, "transition start");
}
mRevealListener.onRevealStart(true /* animate */);
}
}
@@ -82,6 +92,9 @@ class ImageRevealHelper {
}
void updateAwake(boolean awake, long duration) {
if (DEBUG) {
Log.d(TAG, "updateAwake: awake=" + awake + ", duration=" + duration);
}
mAwake = awake;
mAnimator.setDuration(duration);
if (duration == 0) {

24
packages/SystemUI/src/com/android/systemui/glwallpaper/ImageWallpaperRenderer.java
View File

@@ -46,6 +46,7 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
private static final String TAG = ImageWallpaperRenderer.class.getSimpleName();
private static final float SCALE_VIEWPORT_MIN = 1f;
private static final float SCALE_VIEWPORT_MAX = 1.1f;
private static final boolean DEBUG = true;
private final WallpaperManager mWallpaperManager;
private final ImageGLProgram mProgram;
@@ -107,6 +108,9 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
}
private boolean loadBitmap() {
if (DEBUG) {
Log.d(TAG, "loadBitmap: mBitmap=" + mBitmap);
}
if (mWallpaperManager != null && mBitmap == null) {
mBitmap = mWallpaperManager.getBitmap();
mWallpaperManager.forgetLoadedWallpaper();
@@ -119,6 +123,9 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
mSurfaceSize.set(0, 0, surfaceWidth, surfaceHeight);
}
}
if (DEBUG) {
Log.d(TAG, "loadBitmap done, surface size=" + mSurfaceSize);
}
return mBitmap != null;
}
@@ -193,16 +200,28 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
@Override
public void onRevealStart(boolean animate) {
if (DEBUG) {
Log.v(TAG, "onRevealStart: start, anim=" + animate);
}
if (animate) {
mScissorMode = true;
// Use current display area of texture.
mWallpaper.adjustTextureCoordinates(mSurfaceSize, mScissor, mXOffset, mYOffset);
}
mProxy.preRender();
if (DEBUG) {
Log.v(TAG, "onRevealStart: done");
}
}
@Override
public void onRevealEnd() {
if (DEBUG) {
Log.v(TAG, "onRevealEnd: start, mScissorMode=" + mScissorMode);
}
if (mScissorMode) {
mScissorMode = false;
// reset texture coordinates to use full texture.
@@ -211,6 +230,10 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
mProxy.requestRender();
}
mProxy.postRender();
if (DEBUG) {
Log.v(TAG, "onRevealEnd: done");
}
}
@Override
@@ -223,6 +246,7 @@ public class ImageWallpaperRenderer implements GLWallpaperRenderer,
out.print(prefix); out.print("mXOffset="); out.print(mXOffset);
out.print(prefix); out.print("mYOffset="); out.print(mYOffset);
out.print(prefix); out.print("threshold="); out.print(mImageProcessHelper.getThreshold());
out.print(prefix); out.print("mReveal="); out.print(mImageRevealHelper.getReveal());
mWallpaper.dump(prefix, fd, out, args);
}
}