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

Commit fff946a5 authored by John Wu's avatar John Wu
Browse files

[Ravenwood] Sync AOSP and internal main as close as possible 

Make internal code more merge-able with changes in AOSP

Flag: EXEMPT host test change only
Bug: 292141694
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: I83f95346f88f68f7cb4e75204d4181b7e4ed8b8b
parent e6b787e9

ravenwood/junit-impl-src/android/platform/test/ravenwood/RavenwoodRuntimeEnvironmentController.java

+5 −1
Original line number Diff line number Diff line
@@ -335,7 +335,11 @@ public class RavenwoodRuntimeEnvironmentController { 
        }

        android.os.Process.reset$ravenwood();



        try {

            ResourcesManager.setInstance(null); // Better structure needed.

        } catch (Exception e) {

            // AOSP-CHANGE: AOSP doesn't support resources yet.

        }



        if (ENABLE_UNCAUGHT_EXCEPTION_DETECTION) {

            maybeThrowPendingUncaughtException(true);