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

Commit 75d207dc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12098010 from 821ea5a4 to 24Q4-release 

Change-Id: I96a87aab0fd9be0454549c8d5832a410a651309c
parents 7ca5eb4d 821ea5a4

BAL_OWNERS

+2 −0
Original line number Diff line number Diff line
@@ -2,4 +2,6 @@ brufino@google.com 
achim@google.com

topjohnwu@google.com

lus@google.com

haok@google.com

wnan@google.com

apex/jobscheduler/service/java/com/android/server/alarm/AlarmManagerService.java

+4 −2
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ import android.os.SystemProperties; 
import android.os.ThreadLocalWorkSource;

import android.os.Trace;

import android.os.UserHandle;

import android.os.UserManager;

import android.os.WorkSource;

import android.provider.DeviceConfig;

import android.provider.Settings;
@@ -1794,7 +1795,8 @@ public class AlarmManagerService extends SystemService { 
        mActivityManagerInternal = LocalServices.getService(ActivityManagerInternal.class);



        mUseFrozenStateToDropListenerAlarms = Flags.useFrozenStateToDropListenerAlarms();

        mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms();

        mStartUserBeforeScheduledAlarms = Flags.startUserBeforeScheduledAlarms()

                && UserManager.supportsMultipleUsers();

        if (mStartUserBeforeScheduledAlarms) {

            mUserWakeupStore = new UserWakeupStore();

            mUserWakeupStore.init();
@@ -3015,7 +3017,7 @@ public class AlarmManagerService extends SystemService { 
                    mUseFrozenStateToDropListenerAlarms);

            pw.println();

            pw.print(Flags.FLAG_START_USER_BEFORE_SCHEDULED_ALARMS,

                    mStartUserBeforeScheduledAlarms);

                    Flags.startUserBeforeScheduledAlarms());

            pw.decreaseIndent();

            pw.println();

            pw.println();

api/coverage/tools/ExtractFlaggedApis.kt

+9 −9
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.platform.coverage



import com.android.tools.metalava.model.CallableItem

import com.android.tools.metalava.model.ClassItem

import com.android.tools.metalava.model.Item

import com.android.tools.metalava.model.MethodItem

import com.android.tools.metalava.model.text.ApiFile

import java.io.File

import java.io.FileWriter
@@ -40,24 +40,24 @@ fun main(args: Array<String>) { 


fun extractFlaggedApisFromClass(

    classItem: ClassItem,

    methods: List<MethodItem>,

    callables: List<CallableItem>,

    packageName: String,

    builder: FlagApiMap.Builder

) {

    if (methods.isEmpty()) return

    if (callables.isEmpty()) return

    val classFlag = getClassFlag(classItem)

    for (method in methods) {

        val methodFlag = getFlagAnnotation(method) ?: classFlag

    for (callable in callables) {

        val callableFlag = getFlagAnnotation(callable) ?: classFlag

        val api =

            JavaMethod.newBuilder()

                .setPackageName(packageName)

                .setClassName(classItem.fullName())

                .setMethodName(method.name())

        for (param in method.parameters()) {

                .setMethodName(callable.name())

        for (param in callable.parameters()) {

            api.addParameters(param.type().toTypeString())

        }

        if (methodFlag != null) {

            addFlaggedApi(builder, api, methodFlag)

        if (callableFlag != null) {

            addFlaggedApi(builder, api, callableFlag)

        }

    }

}

cmds/bootanimation/BootAnimation.cpp

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void BootAnimation::onFirstRef() { 
        ALOGD("%sAnimationPreloadTiming start time: %" PRId64 "ms",

                mShuttingDown ? "Shutdown" : "Boot", elapsedRealtime());

        preloadAnimation();

        ALOGD("%sAnimationPreloadStopTiming start time: %" PRId64 "ms",

        ALOGD("%sAnimationPreloadTiming stop time: %" PRId64 "ms",

                mShuttingDown ? "Shutdown" : "Boot", elapsedRealtime());

    }

}

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -26593,7 +26593,7 @@ package android.media.projection { 
  public final class MediaProjectionManager {

    method @NonNull public android.content.Intent createScreenCaptureIntent();

    method @NonNull public android.content.Intent createScreenCaptureIntent(@NonNull android.media.projection.MediaProjectionConfig);

    method public android.media.projection.MediaProjection getMediaProjection(int, @NonNull android.content.Intent);

    method @Nullable public android.media.projection.MediaProjection getMediaProjection(int, @NonNull android.content.Intent);

  }















}