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

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

Snap for 10865348 from e4988b45 to 24Q1-release 

Change-Id: Id9cee6fa1357929d10d8d44ba3b87dfa60649a62
parents 9f7cbf63 e4988b45

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ aconfig_srcjars = [ 
    ":hwui_flags_java_lib{.generated_srcjars}",

    ":display_flags_lib{.generated_srcjars}",

    ":android.multiuser.flags-aconfig-java{.generated_srcjars}",

    ":android.app.flags-aconfig-java{.generated_srcjars}",

]



filegroup {
@@ -327,3 +328,16 @@ java_aconfig_library { 
    aconfig_declarations: "android.multiuser.flags-aconfig",

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

}



// Activity Manager

aconfig_declarations {

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

    package: "android.app",

    srcs: ["core/java/android/app/activity_manager.aconfig"],

}



java_aconfig_library {

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

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

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

}

api/StubLibraries.bp

+18 −14
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "public",

}



priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
@@ -120,6 +121,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "system",

}



droidstubs {
@@ -166,6 +168,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "test",

}



droidstubs {
@@ -205,6 +208,7 @@ droidstubs { 
            tag: ".removed-api.txt",

        },

    ],

    api_surface: "module-lib",

}



/////////////////////////////////////////////////////////////////////
@@ -381,8 +385,8 @@ java_defaults { 
java_api_library {

    name: "android-non-updatable.stubs.from-text",

    api_surface: "public",

    api_files: [

        ":non-updatable-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_stubs_current.from-text",
@@ -391,9 +395,9 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.system.from-text",

    api_surface: "system",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_system_stubs_current.from-text",
@@ -402,10 +406,10 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.test.from-text",

    api_surface: "test",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

        ":non-updatable-test-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_test_stubs_current.from-text",
@@ -414,10 +418,10 @@ java_api_library { 
java_api_library {

    name: "android-non-updatable.stubs.module_lib.from-text",

    api_surface: "module_lib",

    api_files: [

        ":non-updatable-current.txt",

        ":non-updatable-system-current.txt",

        ":non-updatable-module-lib-current.txt",

    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "module-lib-api-stubs-docs-non-updatable.api.contribution",

    ],

    defaults: ["android-non-updatable_from_text_defaults"],

    full_api_surface_stub: "android_module_lib_stubs_current_full.from-text",
@@ -615,7 +619,6 @@ java_defaults { 
    name: "android_test_stubs_current_contributions",

    api_surface: "test",

    api_contributions: [

        "test-api-stubs-docs-non-updatable.api.contribution",

        "framework-virtualization.stubs.source.test.api.contribution",

        "framework-location.stubs.source.test.api.contribution",

    ],
@@ -690,6 +693,7 @@ java_api_library { 
    api_contributions: [

        "api-stubs-docs-non-updatable.api.contribution",

        "system-api-stubs-docs-non-updatable.api.contribution",

        "test-api-stubs-docs-non-updatable.api.contribution",

    ],

    visibility: ["//visibility:public"],

}

core/api/current.txt

+18 −18
Original line number Diff line number Diff line
@@ -4616,9 +4616,9 @@ package android.app { 














  public class ActivityManager {















    method public int addAppTask(@NonNull android.app.Activity, @NonNull android.content.Intent, @Nullable android.app.ActivityManager.TaskDescription, @NonNull android.graphics.Bitmap);













    method public void addStartInfoTimestamp(@IntRange(from=android.app.ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER_START, to=android.app.ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER) int, long);













    method @FlaggedApi("android.app.app_start_info") public void addStartInfoTimestamp(@IntRange(from=android.app.ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER_START, to=android.app.ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER) int, long);















    method public void appNotResponding(@NonNull String);













    method public void clearApplicationStartInfoCompletionListener();













    method @FlaggedApi("android.app.app_start_info") public void clearApplicationStartInfoCompletionListener();















    method public boolean clearApplicationUserData();















    method public void clearWatchHeapLimit();















    method @RequiresPermission(android.Manifest.permission.DUMP) public void dumpPackageState(java.io.FileDescriptor, String);









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













    method public java.util.List<android.app.ActivityManager.AppTask> getAppTasks();















    method public android.content.pm.ConfigurationInfo getDeviceConfigurationInfo();















    method @NonNull public java.util.List<android.app.ApplicationExitInfo> getHistoricalProcessExitReasons(@Nullable String, @IntRange(from=0) int, @IntRange(from=0) int);













    method @NonNull public java.util.List<android.app.ApplicationStartInfo> getHistoricalProcessStartReasons(@IntRange(from=0) int);













    method @FlaggedApi("android.app.app_start_info") @NonNull public java.util.List<android.app.ApplicationStartInfo> getHistoricalProcessStartReasons(@IntRange(from=0) int);















    method public int getLargeMemoryClass();















    method public int getLauncherLargeIconDensity();















    method public int getLauncherLargeIconSize();









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













    method @RequiresPermission(android.Manifest.permission.REORDER_TASKS) public void moveTaskToFront(int, int);















    method @RequiresPermission(android.Manifest.permission.REORDER_TASKS) public void moveTaskToFront(int, int, android.os.Bundle);















    method @Deprecated public void restartPackage(String);













    method public void setApplicationStartInfoCompletionListener(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.ApplicationStartInfo>);













    method @FlaggedApi("android.app.app_start_info") public void setApplicationStartInfoCompletionListener(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.app.ApplicationStartInfo>);















    method public void setProcessStateSummary(@Nullable byte[]);















    method public static void setVrThread(int);















    method public void setWatchHeapLimit(long);










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













    field public static final int REASON_USER_STOPPED = 11; // 0xb















  }



























  public final class ApplicationStartInfo implements android.os.Parcelable {













  @FlaggedApi("android.app.app_start_info") public final class ApplicationStartInfo implements android.os.Parcelable {















    method public int describeContents();















    method public int getDefiningUid();















    method @Nullable public android.content.Intent getIntent();










@@ -17563,7 +17563,7 @@ package android.graphics.fonts {













    ctor public FontFamily.Builder(@NonNull android.graphics.fonts.Font);















    method @NonNull public android.graphics.fonts.FontFamily.Builder addFont(@NonNull android.graphics.fonts.Font);















    method @NonNull public android.graphics.fonts.FontFamily build();













    method @Nullable public android.graphics.fonts.FontFamily buildVariableFamily();













    method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") @Nullable public android.graphics.fonts.FontFamily buildVariableFamily();















  }





























  public final class FontStyle {










@@ -17656,7 +17656,7 @@ package android.graphics.text {













    method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public int getHyphenation();















    method public int getLineBreakStyle();















    method public int getLineBreakWordStyle();













    method @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig);













    method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig merge(@NonNull android.graphics.text.LineBreakConfig);















    field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_DISABLED = 0; // 0x0















    field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_ENABLED = 1; // 0x1















    field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int HYPHENATION_UNSPECIFIED = -1; // 0xffffffff









@@ -17664,16 +17664,16 @@ package android.graphics.text {













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















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















    field public static final int LINE_BREAK_STYLE_STRICT = 3; // 0x3













    field public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; // 0xffffffff













    field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_STYLE_UNSPECIFIED = -1; // 0xffffffff















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















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













    field public static final int LINE_BREAK_WORD_STYLE_UNSPECIFIED = -1; // 0xffffffff













    field @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final int LINE_BREAK_WORD_STYLE_UNSPECIFIED = -1; // 0xffffffff















  }





























  public static final class LineBreakConfig.Builder {















    ctor public LineBreakConfig.Builder();















    method @NonNull public android.graphics.text.LineBreakConfig build();













    method @NonNull public android.graphics.text.LineBreakConfig.Builder merge(@NonNull android.graphics.text.LineBreakConfig);













    method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig.Builder merge(@NonNull android.graphics.text.LineBreakConfig);















    method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig.Builder setHyphenation(int);















    method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakStyle(int);















    method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakWordStyle(int);









@@ -17698,7 +17698,7 @@ package android.graphics.text {













    method @NonNull public android.graphics.text.LineBreaker.Builder setHyphenationFrequency(int);















    method @NonNull public android.graphics.text.LineBreaker.Builder setIndents(@Nullable int[]);















    method @NonNull public android.graphics.text.LineBreaker.Builder setJustificationMode(int);













    method @NonNull public android.graphics.text.LineBreaker.Builder setUseBoundsForWidth(boolean);













    method @FlaggedApi("com.android.text.flags.use_bounds_for_width") @NonNull public android.graphics.text.LineBreaker.Builder setUseBoundsForWidth(boolean);















  }





























  public static class LineBreaker.ParagraphConstraints {










@@ -17750,18 +17750,18 @@ package android.graphics.text {













    method public float getAdvance();















    method public float getAscent();















    method public float getDescent();













    method public boolean getFakeBold(@IntRange(from=0) int);













    method public boolean getFakeItalic(@IntRange(from=0) int);













    method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public boolean getFakeBold(@IntRange(from=0) int);













    method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public boolean getFakeItalic(@IntRange(from=0) int);















    method @NonNull public android.graphics.fonts.Font getFont(@IntRange(from=0) int);















    method @IntRange(from=0) public int getGlyphId(@IntRange(from=0) int);















    method public float getGlyphX(@IntRange(from=0) int);















    method public float getGlyphY(@IntRange(from=0) int);













    method public float getItalicOverride(@IntRange(from=0) int);













    method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public float getItalicOverride(@IntRange(from=0) int);















    method public float getOffsetX();















    method public float getOffsetY();













    method public float getWeightOverride(@IntRange(from=0) int);













    method @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public float getWeightOverride(@IntRange(from=0) int);















    method @IntRange(from=0) public int glyphCount();













    field public static final float NO_OVERRIDE = 1.4E-45f;













    field @FlaggedApi("com.android.text.flags.deprecate_fonts_xml") public static final float NO_OVERRIDE = 1.4E-45f;















  }





























  public class TextRunShaper {










@@ -47897,8 +47897,8 @@ package android.text.style {













  }





























  @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public class LineBreakConfigSpan {













    ctor public LineBreakConfigSpan(@NonNull android.graphics.text.LineBreakConfig);













    method @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig();













    ctor @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public LineBreakConfigSpan(@NonNull android.graphics.text.LineBreakConfig);













    method @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig();















  }





























  @FlaggedApi("com.android.text.flags.no_break_no_hyphenation_span") public static final class LineBreakConfigSpan.NoHyphenationSpan extends android.text.style.LineBreakConfigSpan {

























core/api/system-current.txt



+2
−2




























Original line number
Diff line number
Diff line








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













    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public void addOnUidImportanceListener(android.app.ActivityManager.OnUidImportanceListener, int);















    method @RequiresPermission(android.Manifest.permission.FORCE_STOP_PACKAGES) public void forceStopPackage(String);















    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL"}) public static int getCurrentUser();













    method @NonNull @RequiresPermission(android.Manifest.permission.DUMP) public java.util.List<android.app.ApplicationStartInfo> getExternalHistoricalProcessStartReasons(@NonNull String, @IntRange(from=0) int);













    method @FlaggedApi(Flags.FLAG_APP_START_INFO) @NonNull @RequiresPermission(android.Manifest.permission.DUMP) public java.util.List<android.app.ApplicationStartInfo> getExternalHistoricalProcessStartReasons(@NonNull String, @IntRange(from=0) int);















    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getPackageImportance(String);















    method @NonNull public java.util.Collection<java.util.Locale> getSupportedLocales();















    method @RequiresPermission(android.Manifest.permission.PACKAGE_USAGE_STATS) public int getUidImportance(int);










@@ -4529,6 +4529,7 @@ package android.hardware.display {













    method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfiguration(android.hardware.display.BrightnessConfiguration);















    method @RequiresPermission(android.Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) public void setBrightnessConfigurationForDisplay(@NonNull android.hardware.display.BrightnessConfiguration, @NonNull String);















    method @Deprecated @RequiresPermission(android.Manifest.permission.CONTROL_DISPLAY_SATURATION) public void setSaturationLevel(float);













    field public static final int VIRTUAL_DISPLAY_FLAG_ROTATES_WITH_CONTENT = 128; // 0x80















    field public static final int VIRTUAL_DISPLAY_FLAG_STEAL_TOP_FOCUS_DISABLED = 65536; // 0x10000















    field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400















  }










@@ -9842,7 +9843,6 @@ package android.os {













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















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















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













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















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















    field public static final int BUGREPORT_MODE_TELEPHONY = 4; // 0x4















    field public static final int BUGREPORT_MODE_WEAR = 3; // 0x3

























core/java/android/app/ActivityManager.java



+6
−0




























Original line number
Diff line number
Diff line








@@ -24,6 +24,7 @@ import static android.content.pm.ActivityInfo.RESIZE_MODE_RESIZEABLE;













import android.Manifest;















import android.annotation.ColorInt;















import android.annotation.DrawableRes;













import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.IntRange;















import android.annotation.NonNull;










@@ -3982,6 +3983,7 @@ public class ActivityManager {













     *         the order from most recent to least recent.















     */















    @NonNull













    @FlaggedApi(Flags.FLAG_APP_START_INFO)















    public List<ApplicationStartInfo> getHistoricalProcessStartReasons(















            @IntRange(from = 0) int maxNum) {















        try {










@@ -4012,6 +4014,7 @@ public class ActivityManager {













     */















    @NonNull















    @SystemApi













    @FlaggedApi(Flags.FLAG_APP_START_INFO)















    @RequiresPermission(Manifest.permission.DUMP)















    public List<ApplicationStartInfo> getExternalHistoricalProcessStartReasons(















            @NonNull String packageName, @IntRange(from = 0) int maxNum) {










@@ -4044,6 +4047,7 @@ public class ActivityManager {













     *















     * @throws IllegalArgumentException if executor or listener are null.















     */













    @FlaggedApi(Flags.FLAG_APP_START_INFO)















    public void setApplicationStartInfoCompletionListener(@NonNull final Executor executor,















            @NonNull final Consumer<ApplicationStartInfo> listener) {















        Preconditions.checkNotNull(executor, "executor cannot be null");









@@ -4065,6 +4069,7 @@ public class ActivityManager {













    /**















     * Removes the callback set by {@link #setApplicationStartInfoCompletionListener} if there is one.















     */













    @FlaggedApi(Flags.FLAG_APP_START_INFO)















    public void clearApplicationStartInfoCompletionListener() {















        try {















            getService().clearApplicationStartInfoCompleteListener(mContext.getUserId());









@@ -4089,6 +4094,7 @@ public class ActivityManager {













     *                    Will thow {@link java.lang.IllegalArgumentException} if not in range.















     * @param timestampNs Clock monotonic time in nanoseconds of event to be recorded.















     */













    @FlaggedApi(Flags.FLAG_APP_START_INFO)















    public void addStartInfoTimestamp(@IntRange(















            from = ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER_START,















            to = ApplicationStartInfo.START_TIMESTAMP_RESERVED_RANGE_DEVELOPER) int key,