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

Commit 7632e5a7 authored by Presubmit Automerger Backend's avatar Presubmit Automerger Backend
Browse files

[automerge] Enforce limits on memory usage for JsIsolate 2p: 5d190e8a 

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

Bug: 239719630
Change-Id: I3afa6b242e2c1ef11d7d02fe92fd783d575ca14d
parents ea7e31ce 5d190e8a

apct-tests/perftests/rubidium/src/android/rubidium/js/JSScriptEnginePerfTests.java

+12 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import androidx.test.core.app.ApplicationProvider; 
import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import com.android.adservices.service.js.IsolateSettings;

import com.android.adservices.service.js.JSScriptArgument;

import com.android.adservices.service.js.JSScriptArrayArgument;

import com.android.adservices.service.js.JSScriptEngine;
@@ -314,7 +315,11 @@ public class JSScriptEnginePerfTests { 
            @NonNull CountDownLatch resultLatch) {

        Objects.requireNonNull(engine);

        Objects.requireNonNull(resultLatch);

        ListenableFuture<String> result = engine.evaluate(jsScript, args, functionName);

        ListenableFuture<String> result = engine.evaluate(

                jsScript,

                args,

                functionName,

                IsolateSettings.forMaxHeapSizeEnforcementDisabled());

        result.addListener(resultLatch::countDown, sExecutorService);

        return result;

    }
@@ -328,7 +333,12 @@ public class JSScriptEnginePerfTests { 
            @NonNull CountDownLatch resultLatch) {

        Objects.requireNonNull(engine);

        Objects.requireNonNull(resultLatch);

        ListenableFuture<String> result = engine.evaluate(jsScript, wasmScript, args, functionName);

        ListenableFuture<String> result = engine.evaluate(

                jsScript,

                wasmScript,

                args,

                functionName,

                IsolateSettings.forMaxHeapSizeEnforcementDisabled());

        result.addListener(resultLatch::countDown, sExecutorService);

        return result;

    }