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

Commit 0db1beea authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12748980 from f85810e9 to 25Q1-release 

Change-Id: I09f4888c65e69febd453e91aa48a20c90b9775f9
parents 4fe675d7 f85810e9

AconfigFlags.bp

+5 −0
Original line number Diff line number Diff line
@@ -999,6 +999,11 @@ aconfig_declarations { 
java_aconfig_library {

    name: "android.app.flags-aconfig-java",

    aconfig_declarations: "android.app.flags-aconfig",

    min_sdk_version: "34",

    apex_available: [

        "//apex_available:platform",

        "com.android.nfcservices",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}

apex/jobscheduler/service/aconfig/job.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ flag { 
   name: "remove_user_during_user_switch"

   namespace: "backstage_power"

   description: "Remove started user if user will be stopped due to user switch"

   bug: "321598070"

   bug: "337077643"

}



flag {

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+11 −2
Original line number Diff line number Diff line
@@ -1981,7 +1981,12 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    jobStatus.getNumAppliedFlexibleConstraints(),

                    jobStatus.getNumDroppedFlexibleConstraints(),

                    jobStatus.getFilteredTraceTag(),

                    jobStatus.getFilteredDebugTags());

                    jobStatus.getFilteredDebugTags(),

                    jobStatus.getNumAbandonedFailures(),

                    /* 0 is reserved for UNKNOWN_POLICY */

                    jobStatus.getJob().getBackoffPolicy() + 1,

                    shouldUseAggressiveBackoff(jobStatus.getNumAbandonedFailures()));





            // If the job is immediately ready to run, then we can just immediately

            // put it in the pending list and try to schedule it.  This is especially
@@ -2422,7 +2427,11 @@ public class JobSchedulerService extends com.android.server.SystemService 
                    cancelled.getNumAppliedFlexibleConstraints(),

                    cancelled.getNumDroppedFlexibleConstraints(),

                    cancelled.getFilteredTraceTag(),

                    cancelled.getFilteredDebugTags());

                    cancelled.getFilteredDebugTags(),

                    cancelled.getNumAbandonedFailures(),

                    /* 0 is reserved for UNKNOWN_POLICY */

                    cancelled.getJob().getBackoffPolicy() + 1,

                    shouldUseAggressiveBackoff(cancelled.getNumAbandonedFailures()));

        }

        // If this is a replacement, bring in the new version of the job

        if (incomingJob != null) {

apex/jobscheduler/service/java/com/android/server/job/JobServiceContext.java

+10 −2
Original line number Diff line number Diff line
@@ -546,7 +546,11 @@ public final class JobServiceContext implements ServiceConnection { 
                    job.getNumAppliedFlexibleConstraints(),

                    job.getNumDroppedFlexibleConstraints(),

                    job.getFilteredTraceTag(),

                    job.getFilteredDebugTags());

                    job.getFilteredDebugTags(),

                    job.getNumAbandonedFailures(),

                    /* 0 is reserved for UNKNOWN_POLICY */

                    job.getJob().getBackoffPolicy() + 1,

                    mService.shouldUseAggressiveBackoff(job.getNumAbandonedFailures()));

            sEnqueuedJwiAtJobStart.logSampleWithUid(job.getUid(), job.getWorkCount());

            final String sourcePackage = job.getSourcePackageName();

            if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {
@@ -1681,7 +1685,11 @@ public final class JobServiceContext implements ServiceConnection { 
                completedJob.getNumAppliedFlexibleConstraints(),

                completedJob.getNumDroppedFlexibleConstraints(),

                completedJob.getFilteredTraceTag(),

                completedJob.getFilteredDebugTags());

                completedJob.getFilteredDebugTags(),

                completedJob.getNumAbandonedFailures(),

                /* 0 is reserved for UNKNOWN_POLICY */

                completedJob.getJob().getBackoffPolicy() + 1,

                mService.shouldUseAggressiveBackoff(completedJob.getNumAbandonedFailures()));

        if (Trace.isTagEnabled(Trace.TRACE_TAG_SYSTEM_SERVER)) {

            Trace.asyncTraceForTrackEnd(Trace.TRACE_TAG_SYSTEM_SERVER,

                    JobSchedulerService.TRACE_TRACK_NAME, getId());

core/api/current.txt

+7 −1
Original line number Diff line number Diff line
@@ -2201,6 +2201,11 @@ package android { 
    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardFastSpatialDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowEffectDamping;

    field @FlaggedApi("android.os.material_motion_tokens") public static final int config_motionStandardSlowSpatialDamping;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusLarge;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusMedium;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusSmall;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXlarge;

    field @FlaggedApi("android.os.material_shape_tokens") public static final int config_shapeCornerRadiusXsmall;

    field public static final int dialog_min_width_major = 17104899; // 0x1050003

    field public static final int dialog_min_width_minor = 17104900; // 0x1050004

    field public static final int notification_large_icon_height = 17104902; // 0x1050006
@@ -24921,7 +24926,7 @@ package android.media { 
    method @Nullable public android.net.Uri getIconUri();

    method @NonNull public String getId();

    method @NonNull public CharSequence getName();

    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public java.util.Set<java.lang.String> getRequiredPermissions();

    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public java.util.List<java.util.Set<java.lang.String>> getRequiredPermissions();

    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") public int getSuitabilityStatus();

    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") public int getSupportedRoutingTypes();

    method public int getType();
@@ -24991,6 +24996,7 @@ package android.media { 
    method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);

    method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);

    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public android.media.MediaRoute2Info.Builder setRequiredPermissions(@NonNull java.util.Set<java.lang.String>);

    method @FlaggedApi("com.android.media.flags.enable_route_visibility_control_api") @NonNull public android.media.MediaRoute2Info.Builder setRequiredPermissions(@NonNull java.util.List<java.util.Set<java.lang.String>>);

    method @FlaggedApi("com.android.media.flags.enable_built_in_speaker_route_suitability_statuses") @NonNull public android.media.MediaRoute2Info.Builder setSuitabilityStatus(int);

    method @FlaggedApi("com.android.media.flags.enable_mirroring_in_media_router_2") @NonNull public android.media.MediaRoute2Info.Builder setSupportedRoutingTypes(int);

    method @NonNull public android.media.MediaRoute2Info.Builder setType(int);