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

Commit bb8300e1 authored by Patrick Scott's avatar Patrick Scott Committed by Android (Google) Code Review
Browse files

Merge "Fix debug statements and aapt assert."

parents 78098341 4f145c96

core/jni/android_app_NativeActivity.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,7 @@ static const char* const kNativeActivityPathName = "android/app/NativeActivity"; 


#define FIND_CLASS(var, className) \

        var = env->FindClass(className); \

        LOG_FATAL_IF(! var, "Unable to find class " className); \

        LOG_FATAL_IF(! var, "Unable to find class %s", className); \

        var = jclass(env->NewGlobalRef(var));



#define GET_METHOD_ID(var, clazz, methodName, fieldDescriptor) \

tools/aapt/XMLNode.cpp

+0 −4
Original line number Diff line number Diff line
@@ -203,13 +203,9 @@ status_t parseStyledString(Bundle* bundle, 
                }

            }

            if (xliffDepth == 0 && pseudolocalize) {

#ifdef ENABLE_PSEUDOLOCALIZE

                std::string orig(String8(text).string());

                std::string pseudo = pseudolocalize_string(orig);

                curString.append(String16(String8(pseudo.c_str())));

#else

                assert(false);

#endif

            } else {

                if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) {

                    return UNKNOWN_ERROR;