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

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

Snap for 12289667 from d1d010fd to 24Q4-release 

Change-Id: I434863fb34f1bfac579d2c7bcb0c0026a2d1dc6f
parents 441e1a93 d1d010fd

AconfigFlags.bp

+15 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ aconfig_declarations_group { 
        "framework-jobscheduler-job.flags-aconfig-java",

        "framework_graphics_flags_java_lib",

        "hwui_flags_java_lib",

        "interaction_jank_monitor_flags_lib",

        "libcore_exported_aconfig_flags_lib",

        "libgui_flags_java_lib",

        "power_flags_lib",
@@ -1565,3 +1566,17 @@ java_aconfig_library { 
    aconfig_declarations: "dropbox_flags",

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

}



// Zero Jank

aconfig_declarations {

    name: "interaction_jank_monitor_flags",

    package: "com.android.internal.jank",

    container: "system",

    srcs: ["core/java/com/android/internal/jank/flags.aconfig"],

}



java_aconfig_library {

    name: "interaction_jank_monitor_flags_lib",

    aconfig_declarations: "interaction_jank_monitor_flags",

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

}

apct-tests/perftests/protolog/src/com/android/internal/protolog/ProtologPerfTest.java→apct-tests/perftests/protolog/src/com/android/internal/protolog/ProtoLogPerfTest.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import java.util.Arrays; 
import java.util.Collection;



@RunWith(Parameterized.class)

public class ProtologPerfTest {

public class ProtoLogPerfTest {

    @Rule public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();



    @Parameters(name="logToProto_{0}_logToLogcat_{1}")
@@ -49,7 +49,7 @@ public class ProtologPerfTest { 
    private final boolean mLogToProto;

    private final boolean mLogToLogcat;



    public ProtologPerfTest(boolean logToProto, boolean logToLogcat) {

    public ProtoLogPerfTest(boolean logToProto, boolean logToLogcat) {

        mLogToProto = logToProto;

        mLogToLogcat = logToLogcat;

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -1989,12 +1989,10 @@ public class AppStandbyController 
                mAdminProtectedPackages.put(userId, packageNames);

            }

        }

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

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

            postCheckIdleStates(userId);

        }

    }

    }



    @Override

    public void onAdminDataAvailable() {

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -7875,7 +7875,7 @@ package android.app.admin { 
    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.DeviceAdminInfo> CREATOR;

    field public static final int HEADLESS_DEVICE_OWNER_MODE_AFFILIATED = 1; // 0x1

    field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; // 0x2

    field public static final int HEADLESS_DEVICE_OWNER_MODE_SINGLE_USER = 2; // 0x2

    field public static final int HEADLESS_DEVICE_OWNER_MODE_UNSUPPORTED = 0; // 0x0

    field public static final int USES_ENCRYPTED_STORAGE = 7; // 0x7

    field public static final int USES_POLICY_DISABLE_CAMERA = 8; // 0x8

core/api/system-current.txt

+6 −1
Original line number Diff line number Diff line
@@ -1422,7 +1422,7 @@ package android.app.admin { 
    field public static final int STATUS_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd

    field public static final int STATUS_HAS_DEVICE_OWNER = 1; // 0x1

    field public static final int STATUS_HAS_PAIRED = 8; // 0x8

    field @FlaggedApi("android.app.admin.flags.headless_device_owner_single_user_enabled") public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; // 0x11

    field public static final int STATUS_HEADLESS_ONLY_SYSTEM_USER = 17; // 0x11

    field public static final int STATUS_HEADLESS_SYSTEM_USER_MODE_NOT_SUPPORTED = 16; // 0x10

    field public static final int STATUS_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9

    field public static final int STATUS_NONSYSTEM_USER_EXISTS = 5; // 0x5
@@ -3694,9 +3694,11 @@ package android.companion.virtual.sensor { 
    method public int getMinDelay();

    method @NonNull public String getName();

    method public float getPower();

    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public int getReportingMode();

    method public float getResolution();

    method public int getType();

    method @Nullable public String getVendor();

    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") public boolean isWakeUpSensor();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.companion.virtual.sensor.VirtualSensorConfig> CREATOR;

  }
@@ -3710,8 +3712,10 @@ package android.companion.virtual.sensor { 
    method @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setMaximumRange(float);

    method @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setMinDelay(int);

    method @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setPower(float);

    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setReportingMode(int);

    method @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setResolution(float);

    method @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setVendor(@Nullable String);

    method @FlaggedApi("android.companion.virtualdevice.flags.device_aware_display_power") @NonNull public android.companion.virtual.sensor.VirtualSensorConfig.Builder setWakeUpSensor(boolean);

  }















  public interface VirtualSensorDirectChannelCallback {










@@ -11156,6 +11160,7 @@ package android.os {













    method @RequiresPermission(android.Manifest.permission.RECOVERY) public static void processPackage(android.content.Context, java.io.File, android.os.RecoverySystem.ProgressListener) throws java.io.IOException;















    method @Deprecated @RequiresPermission(android.Manifest.permission.RECOVERY) public static void rebootAndApply(@NonNull android.content.Context, @NonNull String, @NonNull String) throws java.io.IOException;















    method @RequiresPermission(anyOf={android.Manifest.permission.RECOVERY, android.Manifest.permission.REBOOT}) public static int rebootAndApply(@NonNull android.content.Context, @NonNull String, boolean) throws java.io.IOException;













    method @FlaggedApi("android.crashrecovery.flags.enable_crashrecovery") @RequiresPermission(android.Manifest.permission.RECOVERY) public static void rebootPromptAndWipeUserData(@NonNull android.content.Context, @NonNull String) throws java.io.IOException;















    method @RequiresPermission(allOf={android.Manifest.permission.RECOVERY, android.Manifest.permission.REBOOT}) public static void rebootWipeAb(android.content.Context, java.io.File, String) throws java.io.IOException;















    method @RequiresPermission(android.Manifest.permission.RECOVERY) public static void scheduleUpdateOnBoot(android.content.Context, java.io.File) throws java.io.IOException;















    method @Deprecated public static boolean verifyPackageCompatibility(java.io.File) throws java.io.IOException;