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

Commit 0d02bf77 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "XmlBlock: if you want to check the result of new, you need nothrow...

Merge "XmlBlock: if you want to check the result of new, you need nothrow new." into main am: 6f766537

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3274312



Change-Id: I866e105db8e791d6e1ac2dfbb642f63e90f8c10c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ec21ff2 6f766537
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static jlong android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobjec
        return 0;
    }

    ResXMLParser* st = new ResXMLParser(*osb);
    ResXMLParser* st = new(std::nothrow) ResXMLParser(*osb);
    if (st == NULL) {
        jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
        return 0;