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

Commit 9e37b806 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 13424156 from bff5e29f to 25Q3-release 

Change-Id: I089631ba4511275f2a036514d840622754c97edb
parents a0136f09 bff5e29f

apex/jobscheduler/service/aconfig/app_idle.aconfig

+0 −10
Original line number Diff line number Diff line 
package: "com.android.server.usage"

container: "system"



flag {

    name: "screen_time_bypass"

    namespace: "backstage_power"

    description: "Bypass the screen time check for bucket evaluation"

    bug: "374114769"

    metadata {

       purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "adjust_default_bucket_elevation_params"

    namespace: "backstage_power"

apex/jobscheduler/service/java/com/android/server/usage/AppIdleHistory.java

+2 −4
Original line number Diff line number Diff line
@@ -702,8 +702,7 @@ public class AppIdleHistory { 
        AppUsageHistory appUsageHistory = getPackageHistory(userHistory, packageName,

                elapsedRealtime, false);

        // If we don't have any state for the app, assume never used

        if (appUsageHistory == null || appUsageHistory.lastUsedElapsedTime < 0

                || (!Flags.screenTimeBypass() && appUsageHistory.lastUsedScreenTime < 0)) {

        if (appUsageHistory == null || appUsageHistory.lastUsedElapsedTime < 0) {

            return -1;

        }
@@ -716,8 +715,7 @@ public class AppIdleHistory { 
        if (DEBUG) Slog.d(TAG, packageName + " screenOn=" + screenOnDelta

                + ", elapsed=" + elapsedDelta);

        for (int i = screenTimeThresholds.length - 1; i >= 0; i--) {

            if ((Flags.screenTimeBypass() || screenOnDelta >= screenTimeThresholds[i])

                && elapsedDelta >= elapsedTimeThresholds[i]) {

            if (elapsedDelta >= elapsedTimeThresholds[i]) {

                return i;

            }

        }

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7002,7 +7002,7 @@ package android.app { 
  }















  public static final class Notification.ProgressStyle.Point {













    ctor public Notification.ProgressStyle.Point(int);













    ctor public Notification.ProgressStyle.Point(@IntRange(from=1) int);















    method @ColorInt public int getColor();















    method public int getId();















    method public int getPosition();









@@ -7011,7 +7011,7 @@ package android.app {













  }





























  public static final class Notification.ProgressStyle.Segment {













    ctor public Notification.ProgressStyle.Segment(int);













    ctor public Notification.ProgressStyle.Segment(@IntRange(from=1) int);















    method @ColorInt public int getColor();















    method public int getId();















    method public int getLength();

























core/api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -13574,6 +13574,7 @@ package android.service.notification {













    field public static final String ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS = "android.service.notification.action.NOTIFICATION_ASSISTANT_DETAIL_SETTINGS";















    field @FlaggedApi("android.service.notification.notification_classification") public static final String ACTION_NOTIFICATION_ASSISTANT_FEEDBACK_SETTINGS = "android.service.notification.action.NOTIFICATION_ASSISTANT_FEEDBACK_SETTINGS";















    field @FlaggedApi("android.app.nm_summarization") public static final String EXTRA_NOTIFICATION_ADJUSTMENT = "android.service.notification.extra.NOTIFICATION_ADJUSTMENT";













    field @FlaggedApi("android.app.nm_summarization") public static final String EXTRA_NOTIFICATION_ADJUSTMENTS = "android.service.notification.extra.NOTIFICATION_ADJUSTMENTS";















    field @FlaggedApi("android.service.notification.notification_classification") public static final String EXTRA_NOTIFICATION_KEY = "android.service.notification.extra.NOTIFICATION_KEY";















    field public static final String FEEDBACK_RATING = "feedback.rating";















    field public static final String SERVICE_INTERFACE = "android.service.notification.NotificationAssistantService";

























core/api/test-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -3066,6 +3066,7 @@ package android.provider {













    field public static final String NOTIFICATION_BADGING = "notification_badging";















    field public static final String NOTIFICATION_BUBBLES = "notification_bubbles";















    field public static final String POWER_MENU_LOCKED_SHOW_CONTENT = "power_menu_locked_show_content";













    field public static final String SCREEN_OFF_UNLOCK_UDFPS_ENABLED = "screen_off_udfps_enabled";















    field public static final String SELECTED_SPELL_CHECKER = "selected_spell_checker";















    field public static final String SELECTED_SPELL_CHECKER_SUBTYPE = "selected_spell_checker_subtype";















    field public static final String SHOW_FIRST_CRASH_DIALOG_DEV_OPTION = "show_first_crash_dialog_dev_option";