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

Merge "Debugging for issue #5180240: Wallpaper continues to consume CPU when screen off"

Browse Source
This commit is contained in:
Dianne Hackborn
2011-08-22 16:22:10 -07:00
committed by Android (Google) Code Review
parent 77eb57fc77 527de8e3de
commit bcdb3e7378
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -18403,6 +18403,7 @@ package android.service.wallpaper {
public class WallpaperService.Engine { public class WallpaperService.Engine {
ctor public WallpaperService.Engine(); ctor public WallpaperService.Engine();
method protected void dump(java.lang.String, java.io.FileDescriptor, java.io.PrintWriter, java.lang.String[]);
method public int getDesiredMinimumHeight(); method public int getDesiredMinimumHeight();
method public int getDesiredMinimumWidth(); method public int getDesiredMinimumWidth();
method public android.view.SurfaceHolder getSurfaceHolder(); method public android.view.SurfaceHolder getSurfaceHolder();

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

@@ -46,7 +46,6 @@ import android.view.InputChannel;
import android.view.InputDevice; import android.view.InputDevice;
import android.view.InputHandler; import android.view.InputHandler;
import android.view.InputQueue; import android.view.InputQueue;
import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.View; import android.view.View;
@@ -54,8 +53,9 @@ import android.view.ViewGroup;
import android.view.ViewRootImpl; import android.view.ViewRootImpl;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.WindowManagerImpl; import android.view.WindowManagerImpl;
import android.view.WindowManagerPolicy;
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
/** /**
@@ -459,6 +459,44 @@ public abstract class WallpaperService extends Service {
public void onSurfaceDestroyed(SurfaceHolder holder) { public void onSurfaceDestroyed(SurfaceHolder holder) {
} }
protected void dump(String prefix, FileDescriptor fd, PrintWriter out, String[] args) {
out.print(prefix); out.print("mInitializing="); out.print(mInitializing);
out.print(" mDestroyed="); out.println(mDestroyed);
out.print(prefix); out.print("mVisible="); out.print(mVisible);
out.print(" mScreenOn="); out.print(mScreenOn);
out.print(" mReportedVisible="); out.println(mReportedVisible);
out.print(prefix); out.print("mCreated="); out.print(mCreated);
out.print(" mSurfaceCreated="); out.print(mSurfaceCreated);
out.print(" mIsCreating="); out.print(mIsCreating);
out.print(" mDrawingAllowed="); out.println(mDrawingAllowed);
out.print(prefix); out.print("mWidth="); out.print(mWidth);
out.print(" mCurWidth="); out.print(mCurWidth);
out.print(" mHeight="); out.print(mHeight);
out.print(" mCurHeight="); out.println(mCurHeight);
out.print(prefix); out.print("mType="); out.print(mType);
out.print(" mWindowFlags="); out.print(mWindowFlags);
out.print(" mCurWindowFlags="); out.println(mCurWindowFlags);
out.print(prefix); out.print("mVisibleInsets=");
out.print(mVisibleInsets.toShortString());
out.print(" mWinFrame="); out.print(mWinFrame.toShortString());
out.print(" mContentInsets="); out.println(mContentInsets.toShortString());
out.print(prefix); out.print("mConfiguration="); out.println(mConfiguration);
out.print(prefix); out.print("mLayout="); out.println(mLayout);
synchronized (mLock) {
out.print(prefix); out.print("mPendingXOffset="); out.print(mPendingXOffset);
out.print(" mPendingXOffset="); out.println(mPendingXOffset);
out.print(prefix); out.print("mPendingXOffsetStep=");
out.print(mPendingXOffsetStep);
out.print(" mPendingXOffsetStep="); out.println(mPendingXOffsetStep);
out.print(prefix); out.print("mOffsetMessageEnqueued=");
out.print(mOffsetMessageEnqueued);
out.print(" mPendingSync="); out.println(mPendingSync);
if (mPendingMove != null) {
out.print(prefix); out.print("mPendingMove="); out.println(mPendingMove);
}
}
}
private void dispatchPointer(MotionEvent event) { private void dispatchPointer(MotionEvent event) {
if (event.isTouchEvent()) { if (event.isTouchEvent()) {
synchronized (mLock) { synchronized (mLock) {
@@ -1012,4 +1050,14 @@ public abstract class WallpaperService extends Service {
* is in the wallpaper picker viewing a preview of it as well. * is in the wallpaper picker viewing a preview of it as well.
*/ */
public abstract Engine onCreateEngine(); public abstract Engine onCreateEngine();
@Override
protected void dump(FileDescriptor fd, PrintWriter out, String[] args) {
out.print("State of wallpaper "); out.print(this); out.println(":");
for (int i=0; i<mActiveEngines.size(); i++) {
Engine engine = mActiveEngines.get(i);
out.print(" Engine "); out.print(engine); out.println(":");
engine.dump(" ", fd, out, args);
}
}
} }