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

Commit 6c09cf04 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 11526283 from ed6f98ac to 24Q2-release 

Change-Id: I5c44220de2a44643b63f66ff48ce62e2e61608b0
parents 99ca2b79 ed6f98ac

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -386,6 +386,7 @@ java_defaults { 
        // TODO(b/120066492): remove gps_debug and protolog.conf.json when the build

        // system propagates "required" properly.

        "gps_debug.conf",

        "protolog.conf.json.gz",

        "core.protolog.pb",

        "framework-res",

        // any install dependencies should go into framework-minus-apex-install-dependencies

Ravenwood.bp

+3 −0
Original line number Diff line number Diff line
@@ -205,8 +205,10 @@ android_ravenwood_libgroup { 
        // Provide runtime versions of utils linked in below

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit-impl",

        "ravenwood-junit-impl-flag",

        "mockito-ravenwood-prebuilt",

        "inline-mockito-ravenwood-prebuilt",

    ],
@@ -220,6 +222,7 @@ android_ravenwood_libgroup { 
    libs: [

        "junit",

        "truth",

        "flag-junit",

        "ravenwood-framework",

        "ravenwood-junit",

        "mockito-ravenwood-prebuilt",

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

+5 −2
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.adservices.service.adselection.AdSelectionConfigArgumentUtil; 
import com.android.adservices.service.adselection.AdWithBidArgumentUtil;

import com.android.adservices.service.adselection.CustomAudienceBiddingSignalsArgumentUtil;

import com.android.adservices.service.adselection.CustomAudienceScoringSignalsArgumentUtil;

import com.android.adservices.service.common.NoOpRetryStrategyImpl;

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

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

import com.android.adservices.service.js.JSScriptArrayArgument;
@@ -411,7 +412,8 @@ public class JSScriptEnginePerfTests { 
                jsScript,

                args,

                functionName,

                IsolateSettings.forMaxHeapSizeEnforcementDisabled());

                IsolateSettings.forMaxHeapSizeEnforcementDisabled(),

                new NoOpRetryStrategyImpl());

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

        return result;

    }
@@ -430,7 +432,8 @@ public class JSScriptEnginePerfTests { 
                wasmScript,

                args,

                functionName,

                IsolateSettings.forMaxHeapSizeEnforcementDisabled());

                IsolateSettings.forMaxHeapSizeEnforcementDisabled(),

                new NoOpRetryStrategyImpl());

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

        return result;

    }

apex/jobscheduler/service/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ java_library { 


    libs: [

        "app-compat-annotations",

        "error_prone_annotations",

        "framework",

        "services.core",

        "unsupportedappusage",

cmds/svc/src/com/android/commands/svc/PowerCommand.java

+4 −8
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import android.os.PowerManager; 
import android.os.RemoteException;

import android.os.ServiceManager;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.sysprop.InitProperties;



public class PowerCommand extends Svc.Command {

    private static final int FORCE_SUSPEND_DELAY_DEFAULT_MILLIS = 0;
@@ -142,12 +140,10 @@ public class PowerCommand extends Svc.Command { 
    // Check if remote exception is benign during shutdown. Pm can be killed

    // before system server during shutdown, so remote exception can be ignored

    // if it is already in shutdown flow.

    // sys.powerctl is no longer set to avoid a possible DOS attack (see

    // bionic/libc/bionic/system_property_set.cpp) so we have no real way of knowing if a

    // remote exception is real or simply because pm is killed (b/318323013)

    // So we simply do not display anything.

    private void maybeLogRemoteException(String msg) {

        String powerProp = SystemProperties.get("sys.powerctl");

        // Also check if userspace reboot is ongoing, since in case of userspace reboot value of the

        // sys.powerctl property will be reset.

        if (powerProp.isEmpty() && !InitProperties.userspace_reboot_in_progress().orElse(false)) {

            System.err.println(msg);

        }

    }

}