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

Commit ead086f1 authored by Nolan Scobie's avatar Nolan Scobie Committed by Android (Google) Code Review
Browse files

Merge "Use "HWUI" LOG_TAG exclusively in libs/hwui/**" into main

parents 45703502 7237e47b

core/java/android/view/ThreadedRenderer.java

+1 −1
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ public final class ThreadedRenderer extends HardwareRenderer { 


        int syncResult = syncAndDrawFrame(frameInfo);

        if ((syncResult & SYNC_LOST_SURFACE_REWARD_IF_FOUND) != 0) {

            Log.w("OpenGLRenderer", "Surface lost, forcing relayout");

            Log.w("HWUI", "Surface lost, forcing relayout");

            // We lost our surface. For a relayout next frame which should give us a new

            // surface from WindowManager, which hopefully will work.

            attachInfo.mViewRootImpl.mForceNextWindowRelayout = true;

libs/hwui/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ cc_defaults { 
        "-DEGL_EGLEXT_PROTOTYPES",

        "-DGL_GLEXT_PROTOTYPES",

        "-DATRACE_TAG=ATRACE_TAG_VIEW",

        "-DLOG_TAG=\"OpenGLRenderer\"",

        "-DLOG_TAG=\"HWUI\"",

        "-Wall",

        "-Wthread-safety",

        "-Wno-unused-parameter",

libs/hwui/apex/android_bitmap.cpp

+0 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * limitations under the License.

 */



#undef LOG_TAG

#define LOG_TAG "Bitmap"

#include <log/log.h>



#include "android/graphics/bitmap.h"

libs/hwui/apex/jni_runtime.cpp

+0 −3
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 
#include <sys/cdefs.h>

#include <vulkan/vulkan.h>



#undef LOG_TAG

#define LOG_TAG "AndroidGraphicsJNI"



extern int register_android_graphics_Bitmap(JNIEnv*);

extern int register_android_graphics_BitmapFactory(JNIEnv*);

extern int register_android_graphics_BitmapRegionDecoder(JNIEnv*);

libs/hwui/hwui/ImageDecoder.cpp

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ 


#include <memory>



#undef LOG_TAG

#define LOG_TAG "ImageDecoder"



using namespace android;



sk_sp<SkColorSpace> ImageDecoder::getDefaultColorSpace() const {