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

Commit bd5662a1 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ifd71653f into eclair-mr2 

* changes:
  add local flag to enable FPS w/o having to enable Config.DEBUG, which can have unintended costs
parents 5ad40971 fd71653f

core/java/android/view/ViewRoot.java

+3 −2
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public final class ViewRoot extends Handler implements ViewParent, 
        View.AttachInfo.Callbacks {

    private static final String TAG = "ViewRoot";

    private static final boolean DBG = false;

    private static final boolean SHOW_FPS = false;

    @SuppressWarnings({"ConstantConditionalExpression"})

    private static final boolean LOCAL_LOGV = false ? Config.LOGD : Config.LOGV;

    /** @noinspection PointlessBooleanExpression*/
@@ -1244,7 +1245,7 @@ public final class ViewRoot extends Handler implements ViewParent, 
                    mEgl.eglSwapBuffers(mEglDisplay, mEglSurface);

                    checkEglErrors();



                    if (Config.DEBUG && ViewDebug.showFps) {

                    if (SHOW_FPS || Config.DEBUG && ViewDebug.showFps) {

                        int now = (int)SystemClock.elapsedRealtime();

                        if (sDrawTime != 0) {

                            nativeShowFPS(canvas, now - sDrawTime);
@@ -1356,7 +1357,7 @@ public final class ViewRoot extends Handler implements ViewParent, 
                    mView.dispatchConsistencyCheck(ViewDebug.CONSISTENCY_DRAWING);

                }



                if (Config.DEBUG && ViewDebug.showFps) {

                if (SHOW_FPS || Config.DEBUG && ViewDebug.showFps) {

                    int now = (int)SystemClock.elapsedRealtime();

                    if (sDrawTime != 0) {

                        nativeShowFPS(canvas, now - sDrawTime);