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

Commit 8caa214f authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix typo, etc" into main

parents 73c8cfce f96aa34f

core/jni/LayoutlibLoader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ using namespace android; 


// Called right before aborting by LOG_ALWAYS_FATAL. Print the pending exception.

void abort_handler(const char* abort_message) {

    ALOGE("Abort to abort the process...");

    ALOGE("About to abort the process...");



    JNIEnv* env = NULL;

    if (javaVM->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {

tools/hoststubgen/hoststubgen/src/com/android/hoststubgen/filters/SubclassFilter.kt

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import com.android.hoststubgen.asm.toJvmClassName 


/**

 * Filter to apply a policy to classes extending or implementing a class,

 * either directly or indirectly. (with a breadth first search.)

 * either directly or indirectly.

 *

 * The policy won't apply to the super class itself.

 */
@@ -42,7 +42,7 @@ class SubclassFilter( 
    }



    /**

     * Find a policy for a class with a breadth-first search.

     * Find a policy for a class.

     */

    private fun findPolicyForClass(className: String): FilterPolicyWithReason? {

        val cn = classes.findClass(className) ?: return null