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

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

Snap for 12147630 from e02cd99c to 24Q4-release 

Change-Id: Ic688428408e5e22db043865d1ee30aeb23cbc5ff
parents 1c21ce72 e02cd99c

AconfigFlags.bp

+7 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ aconfig_declarations_group { 
        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "libcore_exported_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",

        "sdk_sandbox_flags_lib",

        "surfaceflinger_flags_java_lib",
@@ -1208,6 +1209,12 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

    name: "libgui_flags_java_lib",

    aconfig_declarations: "libgui_flags",

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

}



// Content Capture

aconfig_declarations {

    name: "android.view.contentcapture.flags-aconfig",

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ java_defaults { 
    ],

    sdk_version: "core_platform",

    static_libs: [

        "aconfig_storage_reader_java",

        "android.hardware.common.fmq-V1-java",

        "bouncycastle-repackaged-unbundled",

        "com.android.sysprop.foldlockbehavior",
@@ -636,7 +637,6 @@ java_library { 
        "core/java/com/android/internal/util/AsyncService.java",

        "core/java/com/android/internal/util/Protocol.java",

        "telephony/java/android/telephony/Annotation.java",

        ":net-utils-framework-wifi-common-srcs",

    ],

    libs: [

        "framework-annotations-lib",

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

+3 −2
Original line number Diff line number Diff line
@@ -4495,7 +4495,8 @@ public class AlarmManagerService extends SystemService { 
                            final int[] userIds =

                                    mUserWakeupStore.getUserIdsToWakeup(nowELAPSED);

                            for (int i = 0; i < userIds.length; i++) {

                                if (!mActivityManagerInternal.startUserInBackground(

                                if (mActivityManagerInternal.isUserRunning(userIds[i], 0)

                                        || !mActivityManagerInternal.startUserInBackground(

                                                userIds[i])) {

                                    mUserWakeupStore.removeUserWakeup(userIds[i]);

                                }

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

+1 −1
Original line number Diff line number Diff line
@@ -1990,7 +1990,7 @@ public class AppStandbyController 
            }

        }

        if (android.app.admin.flags.Flags.disallowUserControlBgUsageFix()) {

            if (!Flags.avoidIdleCheck()) {

            if (!Flags.avoidIdleCheck() || mInjector.getBootPhase() >= PHASE_BOOT_COMPLETED) {

                postCheckIdleStates(userId);

            }

        }

core/api/current.txt

+0 −5
Original line number Diff line number Diff line
@@ -54862,8 +54862,6 @@ package android.view.accessibility { 
    method @Deprecated public void addAction(int);

    method public void addChild(android.view.View);

    method public void addChild(android.view.View, int);

    method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public void addLabeledBy(@NonNull android.view.View);

    method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public void addLabeledBy(@NonNull android.view.View, int);

    method public boolean canOpenPopup();

    method public int describeContents();

    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String);
@@ -54892,7 +54890,6 @@ package android.view.accessibility { 
    method public int getInputType();

    method public android.view.accessibility.AccessibilityNodeInfo getLabelFor();

    method public android.view.accessibility.AccessibilityNodeInfo getLabeledBy();

    method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") @NonNull public java.util.List<android.view.accessibility.AccessibilityNodeInfo> getLabeledByList();

    method public int getLiveRegion();

    method public int getMaxTextLength();

    method @NonNull public java.time.Duration getMinDurationBetweenContentChanges();
@@ -54953,8 +54950,6 @@ package android.view.accessibility { 
    method public boolean removeAction(android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction);

    method public boolean removeChild(android.view.View);

    method public boolean removeChild(android.view.View, int);

    method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public boolean removeLabeledBy(@NonNull android.view.View);

    method @FlaggedApi("android.view.accessibility.support_multiple_labeledby") public boolean removeLabeledBy(@NonNull android.view.View, int);

    method public void setAccessibilityDataSensitive(boolean);

    method public void setAccessibilityFocused(boolean);

    method public void setAvailableExtraData(java.util.List<java.lang.String>);