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

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

Snap for 11175020 from 1b4f4f41 to 24Q1-release 

Change-Id: Id8e91a0651c7a6314143b918b8c570196b01b8c3
parents 615e8eac 1b4f4f41

AconfigFlags.bp

+4 −1
Original line number Diff line number Diff line
@@ -428,7 +428,10 @@ java_aconfig_library { 
aconfig_declarations {

    name: "com.android.media.flags.bettertogether-aconfig",

    package: "com.android.media.flags",

    srcs: ["media/java/android/media/flags/media_better_together.aconfig"],

    srcs: [

        "media/java/android/media/flags/media_better_together.aconfig",

        "media/java/android/media/flags/fade_manager_configuration.aconfig",

    ],

}



java_aconfig_library {

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -379,6 +379,7 @@ java_defaults { 
        // system propagates "required" properly.

        "gps_debug.conf",

        "protolog.conf.json.gz",

        "framework-res",

        // any install dependencies should go into framework-minus-apex-install-dependencies

        // rather than here to avoid bloating incremental build time

    ],

core/api/current.txt

+11 −1
Original line number Diff line number Diff line
@@ -12428,7 +12428,7 @@ package android.content.pm { 
    method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback);

    method public void registerSessionCallback(@NonNull android.content.pm.PackageInstaller.SessionCallback, @NonNull android.os.Handler);

    method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void reportUnarchivalStatus(int, int, long, @Nullable android.app.PendingIntent) throws android.content.pm.PackageManager.NameNotFoundException;

    method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void requestArchive(@NonNull String, @NonNull android.content.IntentSender) throws android.content.pm.PackageManager.NameNotFoundException;

    method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void requestArchive(@NonNull String, @NonNull android.content.IntentSender, int) throws android.content.pm.PackageManager.NameNotFoundException;

    method @FlaggedApi("android.content.pm.archiving") @RequiresPermission(anyOf={android.Manifest.permission.INSTALL_PACKAGES, android.Manifest.permission.REQUEST_INSTALL_PACKAGES}) public void requestUnarchive(@NonNull String, @NonNull android.content.IntentSender) throws java.io.IOException, android.content.pm.PackageManager.NameNotFoundException;

    method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull String, @NonNull android.content.IntentSender);

    method @RequiresPermission(anyOf={android.Manifest.permission.DELETE_PACKAGES, android.Manifest.permission.REQUEST_DELETE_PACKAGES}) public void uninstall(@NonNull android.content.pm.VersionedPackage, @NonNull android.content.IntentSender);
@@ -12853,6 +12853,8 @@ package android.content.pm { 
    field public static final int COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED = 4; // 0x4

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

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

    field @FlaggedApi("android.content.pm.archiving") public static final int DELETE_ARCHIVE = 16; // 0x10

    field @FlaggedApi("android.content.pm.archiving") public static final int DELETE_SHOW_DIALOG = 32; // 0x20

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

    field public static final String EXTRA_VERIFICATION_ID = "android.content.pm.extra.VERIFICATION_ID";

    field public static final String EXTRA_VERIFICATION_RESULT = "android.content.pm.extra.VERIFICATION_RESULT";
@@ -19508,6 +19510,7 @@ package android.hardware.camera2 { 
    field @Deprecated @NonNull public static final android.hardware.camera2.CaptureResult.Key<float[]> LENS_RADIAL_DISTORTION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> LENS_STATE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.String> LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_ID;

    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Rect> LOGICAL_MULTI_CAMERA_ACTIVE_PHYSICAL_SENSOR_CROP_REGION;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> NOISE_REDUCTION_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> REPROCESS_EFFECTIVE_EXPOSURE_FACTOR;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Byte> REQUEST_PIPELINE_DEPTH;
@@ -19533,6 +19536,7 @@ package android.hardware.camera2 { 
    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_FACE_DETECT_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.graphics.Point[]> STATISTICS_HOT_PIXEL_MAP;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> STATISTICS_HOT_PIXEL_MAP_MODE;

    field @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensIntrinsicsSample[]> STATISTICS_LENS_INTRINSICS_SAMPLES;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<android.hardware.camera2.params.LensShadingMap> STATISTICS_LENS_SHADING_CORRECTION_MAP;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_LENS_SHADING_MAP_MODE;

    field @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Integer> STATISTICS_OIS_DATA_MODE;
@@ -19689,6 +19693,12 @@ package android.hardware.camera2.params { 
    method public boolean isMultiResolution();

  }













  @FlaggedApi("com.android.internal.camera.flags.concert_mode") public final class LensIntrinsicsSample {













    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public LensIntrinsicsSample(long, @NonNull float[]);













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public float[] getLensIntrinsics();













    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public long getTimestamp();













  }



























  public final class LensShadingMap {















    method public void copyGainFactors(float[], int);















    method public int getColumnCount();

























core/api/system-current.txt



+1
−0






























Original line number
Diff line number
Diff line








@@ -3872,6 +3872,7 @@ package android.content.pm {













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















    field public static final String EXTRA_CALLBACK = "android.content.pm.extra.CALLBACK";















    field public static final String EXTRA_DATA_LOADER_TYPE = "android.content.pm.extra.DATA_LOADER_TYPE";













    field @FlaggedApi("android.content.pm.archiving") public static final String EXTRA_DELETE_FLAGS = "android.content.pm.extra.DELETE_FLAGS";















    field public static final String EXTRA_LEGACY_STATUS = "android.content.pm.extra.LEGACY_STATUS";















    field @Deprecated public static final String EXTRA_RESOLVED_BASE_PATH = "android.content.pm.extra.RESOLVED_BASE_PATH";















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

























core/java/android/app/Activity.java



+8
−0






























Original line number
Diff line number
Diff line








@@ -971,6 +971,7 @@ public class Activity extends ContextThemeWrapper





























    private final ActivityManager.TaskDescription mTaskDescription =















            new ActivityManager.TaskDescription();













    private int mLastTaskDescriptionHashCode;































    protected static final int[] FOCUSED_STATE_SET = {com.android.internal.R.attr.state_focused};


























@@ -7612,6 +7613,13 @@ public class Activity extends ContextThemeWrapper













                mTaskDescription.setIcon(Icon.createWithBitmap(icon));















            }















        }













        if (mLastTaskDescriptionHashCode == mTaskDescription.hashCode()) {













            // Early return if the hashCode is the same.













            // Note that we do not use #equals() to perform the check because there are several













            // places in this class that directly sets the value to mTaskDescription.













            return;













        }













        mLastTaskDescriptionHashCode = mTaskDescription.hashCode();















        ActivityClient.getInstance().setTaskDescription(mToken, mTaskDescription);















    }