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

Commit 3d782666 authored by Stephen Hines's avatar Stephen Hines
Browse files

Remove verbose logging, update test app and docs. 

Change-Id: I6659c5e51a747011239128dc2682a5d78aecfa26
parent 8969d992

graphics/java/android/renderscript/Font.java

+4 −2
Original line number Diff line number Diff line
@@ -201,12 +201,14 @@ public class Font extends BaseObj { 


    /**

     * Accepts one of the following family names as an argument

     * and will attemp to produce the best match with a system font

     * and will attempt to produce the best match with a system font:

     *

     * "sans-serif" "arial" "helvetica" "tahoma" "verdana"

     * "serif" "times" "times new roman" "palatino" "georgia" "baskerville"

     * "goudy" "fantasy" "cursive" "ITC Stone Serif"

     * "monospace" "courier" "courier new" "monaco"

     * Returns default font if no match could be found

     *

     * Returns default font if no match could be found.

     */

    static public Font create(RenderScript rs, Resources res, String familyName, Style fontStyle, float pointSize) {

        String fileName = getFontFileName(familyName, fontStyle);

libs/rs/driver/rsdAllocation.cpp

+2 −2
Original line number Diff line number Diff line
@@ -460,8 +460,8 @@ void rsdAllocationData2D_alloc_script(const android::renderscript::Context *rsc, 
        uint8_t *srcPtr = getOffsetPtr(srcAlloc, srcXoff, srcYoff + i, srcLod, srcFace);

        memcpy(dstPtr, srcPtr, w * elementSize);



        LOGE("COPIED dstXoff(%u), dstYoff(%u), dstLod(%u), dstFace(%u), w(%u), h(%u), srcXoff(%u), srcYoff(%u), srcLod(%u), srcFace(%u)",

             dstXoff, dstYoff, dstLod, dstFace, w, h, srcXoff, srcYoff, srcLod, srcFace);

        //LOGE("COPIED dstXoff(%u), dstYoff(%u), dstLod(%u), dstFace(%u), w(%u), h(%u), srcXoff(%u), srcYoff(%u), srcLod(%u), srcFace(%u)",

        //     dstXoff, dstYoff, dstLod, dstFace, w, h, srcXoff, srcYoff, srcLod, srcFace);

    }

}

tests/RenderScriptTests/tests/src/com/android/rs/test/RSTest.java

+9 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ import java.lang.Runtime; 
public class RSTest extends Activity {

    //EventListener mListener = new EventListener();



    private static final String LOG_TAG = "libRS_jni";

    private static final String LOG_TAG = "RSTest";

    private static final boolean DEBUG  = false;

    private static final boolean LOG_ENABLED = false;
@@ -73,6 +73,14 @@ public class RSTest extends Activity { 
        mView.pause();

    }



    @Override

    protected void onStop() {

        // Actually kill the app if we are stopping. We don't want to

        // continue/resume this test ever. It should always start fresh.

        finish();

        super.onStop();

    }



    static void log(String message) {

        if (LOG_ENABLED) {

            Log.v(LOG_TAG, message);

tests/RenderScriptTests/tests/src/com/android/rs/test/UnitTest.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.rs.test;

import android.content.Context;

import android.renderscript.RenderScript.RSMessageHandler;

import android.util.Log;



public class UnitTest extends Thread {

    public String name;
@@ -67,7 +66,7 @@ public class UnitTest extends Thread { 
                        result = -1;

                        break;

                    default:

                        android.util.Log.v("RenderScript", "Unit test got unexpected message");

                        RSTest.log("Unit test got unexpected message");

                        return;

                }

            }