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

Commit 3aa258d5 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7298338 from f99023b5 to sc-release 

Change-Id: Id5e93629157c767b8c5ba2957274318c91608231
parents a416cc7c f99023b5

ProtoLibraries.bp

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ gensrcs { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        ":libtombstone_proto-src",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",
@@ -64,6 +65,7 @@ gensrcs { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/**/*.proto",

        ":service-permission-protos",
@@ -78,6 +80,7 @@ java_library_host { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        ":libstats_internal_protos",

        ":statsd_internal_protos",

        "cmds/am/proto/instrumentation_data.proto",
@@ -116,6 +119,7 @@ java_library { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

        ":service-permission-protos",
@@ -133,6 +137,7 @@ java_library { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        "libs/incident/proto/android/os/**/*.proto",

        ":service-permission-protos",
@@ -169,6 +174,7 @@ cc_defaults { 
    srcs: [

        ":ipconnectivity-proto-src",

        ":libstats_atom_enum_protos",

        ":libstats_atom_message_protos",

        "core/proto/**/*.proto",

        ":service-permission-protos",

    ],

apex/jobscheduler/framework/java/android/app/AlarmManager.java

+48 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.app; 
import android.Manifest;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.RequiresPermission;

import android.annotation.SdkConstant;

import android.annotation.SystemApi;
@@ -591,8 +592,8 @@ public class AlarmManager { 
     *        in milliseconds.  The alarm will be delivered no later than this many

     *        milliseconds after {@code windowStartMillis}.  Note that this parameter

     *        is a <i>duration,</i> not the timestamp of the end of the window.

     * @param tag string describing the alarm, used for logging and battery-use

     *         attribution

     * @param tag Optional. A string describing the alarm, used for logging and battery-use

     *         attribution.

     * @param listener {@link OnAlarmListener} instance whose

     *         {@link OnAlarmListener#onAlarm() onAlarm()} method will be

     *         called when the alarm time is reached.  A given OnAlarmListener instance can
@@ -605,9 +606,8 @@ public class AlarmManager { 
    @SystemApi

    @RequiresPermission(Manifest.permission.SCHEDULE_PRIORITIZED_ALARM)

    public void setPrioritized(@AlarmType int type, long windowStartMillis, long windowLengthMillis,

            @NonNull String tag, @NonNull Executor executor, @NonNull OnAlarmListener listener) {

            @Nullable String tag, @NonNull Executor executor, @NonNull OnAlarmListener listener) {

        Objects.requireNonNull(executor);

        Objects.requireNonNull(tag);

        Objects.requireNonNull(listener);

        setImpl(type, windowStartMillis, windowLengthMillis, 0, FLAG_PRIORITIZE, null, listener,

                tag, executor, null, null);
@@ -782,6 +782,50 @@ public class AlarmManager { 
                targetHandler, workSource, null);

    }



    /**

     * Exact version of {@link #set(int, long, long, long, OnAlarmListener, Handler, WorkSource)}.

     * This equivalent to calling the aforementioned API with {@code windowMillis} and

     * {@code intervalMillis} set to 0.

     * One subtle difference is that this API requires {@code workSource} to be non-null. If you

     * don't want to attribute this alarm to another app for battery consumption, you should use

     * {@link #setExact(int, long, String, OnAlarmListener, Handler)} instead.

     *

     * <p>

     * Note that using this API requires you to hold

     * {@link Manifest.permission#SCHEDULE_EXACT_ALARM}, unless you are on the system's power

     * allowlist. This can be set, for example, by marking the app as {@code <allow-in-power-save>}

     * within the system config.

     *

     * @param type            type of alarm

     * @param triggerAtMillis The exact time in milliseconds, that the alarm should be delivered,

     *                        expressed in the appropriate clock's units (depending on the alarm

     *                        type).

     * @param listener        {@link OnAlarmListener} instance whose

     *                        {@link OnAlarmListener#onAlarm() onAlarm()} method will be called when

     *                        the alarm time is reached.

     * @param executor        The {@link Executor} on which to execute the listener's onAlarm()

     *                        callback.

     * @param tag             Optional. A string tag used to identify this alarm in logs and

     *                        battery-attribution.

     * @param workSource      A {@link WorkSource} object to attribute this alarm to the app that

     *                        requested this work.

     * @hide

     */

    @SystemApi

    @RequiresPermission(allOf = {

            Manifest.permission.UPDATE_DEVICE_STATS,

            Manifest.permission.SCHEDULE_EXACT_ALARM}, conditional = true)

    public void setExact(@AlarmType int type, long triggerAtMillis, @Nullable String tag,

            @NonNull Executor executor, @NonNull WorkSource workSource,

            @NonNull OnAlarmListener listener) {

        Objects.requireNonNull(executor);

        Objects.requireNonNull(workSource);

        Objects.requireNonNull(listener);

        setImpl(type, triggerAtMillis, WINDOW_EXACT, 0, 0, null, listener, tag, executor,

                workSource, null);

    }





    private void setImpl(@AlarmType int type, long triggerAtMillis, long windowMillis,

            long intervalMillis, int flags, PendingIntent operation, final OnAlarmListener listener,

            String listenerTag, Handler targetHandler, WorkSource workSource,

apex/jobscheduler/service/jni/Android.bp

+0 −11
Original line number Diff line number Diff line
@@ -29,14 +29,3 @@ cc_library_shared { 
        "libbase",

    ],

}
 


filegroup {

    name: "lib_alarmManagerService_native",

    srcs: [

        "com_android_server_alarm_AlarmManagerService.cpp",

    ],

    visibility: [

        // TODO: remove this

        "//vendor:__subpackages__",

    ],

}

boot/Android.bp

+13 −3
Original line number Diff line number Diff line
@@ -44,6 +44,19 @@ package { 
platform_bootclasspath {

    name: "platform-bootclasspath",



    // The bootclasspath_fragments that contribute to the platform

    // bootclasspath.

    fragments: [

        {

            apex: "com.android.art",

            module: "art-bootclasspath-fragment",

        },

        {

            apex: "com.android.i18n",

            module: "i18n-bootclasspath-fragment",

        },

    ],



    // Additional information needed by hidden api processing.

    hidden_api: {

        unsupported: [
@@ -64,9 +77,6 @@ platform_bootclasspath { 
        max_target_o_low_priority: [

            "hiddenapi/hiddenapi-max-target-o.txt",

        ],

        blocked: [

            "hiddenapi/hiddenapi-force-blocked.txt",

        ],

        unsupported_packages: [

            "hiddenapi/hiddenapi-unsupported-packages.txt",

        ],

boot/hiddenapi/hiddenapi-force-blocked.txt

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
Ldalvik/system/VMRuntime;->setHiddenApiExemptions([Ljava/lang/String;)V

Ldalvik/system/VMRuntime;->setTargetSdkVersion(I)V

Ldalvik/system/VMRuntime;->setTargetSdkVersionNative(I)V

Ljava/lang/invoke/MethodHandles$Lookup;->IMPL_LOOKUP:Ljava/lang/invoke/MethodHandles$Lookup;

Ljava/lang/invoke/VarHandle;->acquireFence()V

Ljava/lang/invoke/VarHandle;->compareAndExchange([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndExchangeRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->compareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->fullFence()V

Ljava/lang/invoke/VarHandle;->get([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAdd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndAddRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAnd([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseAndRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOr([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseOrRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXor([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndBitwiseXorRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSet([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetAcquire([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getAndSetRelease([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getOpaque([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->getVolatile([Ljava/lang/Object;)Ljava/lang/Object;

Ljava/lang/invoke/VarHandle;->loadLoadFence()V

Ljava/lang/invoke/VarHandle;->releaseFence()V

Ljava/lang/invoke/VarHandle;->set([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setOpaque([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setRelease([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->setVolatile([Ljava/lang/Object;)V

Ljava/lang/invoke/VarHandle;->storeStoreFence()V

Ljava/lang/invoke/VarHandle;->weakCompareAndSet([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetAcquire([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetPlain([Ljava/lang/Object;)Z

Ljava/lang/invoke/VarHandle;->weakCompareAndSetRelease([Ljava/lang/Object;)Z