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

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

Snap for 12369952 from 91fabba7 to 24Q4-release 

Change-Id: I56aae5a8a9d03c09a93da174cb756d381f8607ab
parents a26367ee 91fabba7

core/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -19170,7 +19170,7 @@ package android.hardware.camera2 { 
    method @NonNull public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableCaptureRequestKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CaptureResult.Key<?>> getAvailableCaptureResultKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailablePhysicalCameraRequestKeys();

    method @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys();

    method public java.util.List<android.hardware.camera2.CaptureRequest.Key<?>> getAvailableSessionKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeys();

    method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();
@@ -19213,7 +19213,7 @@ package android.hardware.camera2 { 
    field @FlaggedApi("com.android.internal.camera.flags.camera_manual_flash_strength_control") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_TORCH_STRENGTH_MAX_LEVEL;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateSensorOrientationMap> INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP;

    field @FlaggedApi("com.android.internal.camera.flags.feature_combination_query") @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SESSION_CONFIGURATION_QUERY_VERSION;

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

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

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

    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES;
@@ -20083,14 +20083,14 @@ package android.hardware.camera2.params { 














  public final class ExtensionSessionConfiguration {















    ctor public ExtensionSessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraExtensionSession.StateCallback);













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void clearColorSpace();













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") @Nullable public android.graphics.ColorSpace getColorSpace();













    method public void clearColorSpace();













    method @Nullable public android.graphics.ColorSpace getColorSpace();















    method @NonNull public java.util.concurrent.Executor getExecutor();















    method public int getExtension();















    method @NonNull public java.util.List<android.hardware.camera2.params.OutputConfiguration> getOutputConfigurations();















    method @Nullable public android.hardware.camera2.params.OutputConfiguration getPostviewOutputConfiguration();















    method @NonNull public android.hardware.camera2.CameraExtensionSession.StateCallback getStateCallback();













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);













    method public void setColorSpace(@NonNull android.graphics.ColorSpace.Named);















    method public void setPostviewOutputConfiguration(@Nullable android.hardware.camera2.params.OutputConfiguration);















  }







































core/api/system-current.txt



+4
−4




























Original line number
Diff line number
Diff line








@@ -4972,12 +4972,12 @@ package android.hardware.camera2.extension {



























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















    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public CameraOutputSurface(@NonNull android.view.Surface, @NonNull android.util.Size);













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public int getColorSpace();













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public long getDynamicRangeProfile();













    method public int getColorSpace();













    method public long getDynamicRangeProfile();















    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") public int getImageFormat();















    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.util.Size getSize();















    method @FlaggedApi("com.android.internal.camera.flags.concert_mode") @NonNull public android.view.Surface getSurface();













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setDynamicRangeProfile(long);













    method public void setDynamicRangeProfile(long);















  }





























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









@@ -4987,7 +4987,7 @@ package android.hardware.camera2.extension {



























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















    ctor @FlaggedApi("com.android.internal.camera.flags.concert_mode") public ExtensionConfiguration(int, int, @NonNull java.util.List<android.hardware.camera2.extension.ExtensionOutputConfiguration>, @Nullable android.hardware.camera2.CaptureRequest);













    method @FlaggedApi("com.android.internal.camera.flags.extension_10_bit") public void setColorSpace(int);













    method public void setColorSpace(int);















  }





























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

























core/java/android/app/Instrumentation.java



+3
−3




























Original line number
Diff line number
Diff line








@@ -2408,9 +2408,9 @@ public class Instrumentation {













     * @hide















     */















    @android.ravenwood.annotation.RavenwoodKeep













    public final void basicInit(Context context) {













        mInstrContext = context;













        mAppContext = context;













    public final void basicInit(Context instrContext, Context appContext) {













        mInstrContext = instrContext;













        mAppContext = appContext;















    }































    /** @hide */

































core/java/android/hardware/camera2/CameraCharacteristics.java



+0
−2




























Original line number
Diff line number
Diff line








@@ -567,7 +567,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri













     * @see #INFO_SESSION_CONFIGURATION_QUERY_VERSION















     */















    @NonNull













    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)















    public List<CameraCharacteristics.Key<?>> getAvailableSessionCharacteristicsKeys() {















        if (mAvailableSessionCharacteristicsKeys != null) {















            return mAvailableSessionCharacteristicsKeys;










@@ -5210,7 +5209,6 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri













     */















    @PublicKey















    @NonNull













    @FlaggedApi(Flags.FLAG_FEATURE_COMBINATION_QUERY)















    public static final Key<Integer> INFO_SESSION_CONFIGURATION_QUERY_VERSION =















            new Key<Integer>("android.info.sessionConfigurationQueryVersion", int.class);

















































core/java/android/hardware/camera2/extension/CameraOutputSurface.java



+0
−3




























Original line number
Diff line number
Diff line








@@ -107,7 +107,6 @@ public final class CameraOutputSurface {













     * {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}















     * unless specified by CameraOutputSurface.setDynamicRangeProfile.















     */













    @FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)















    public @DynamicRangeProfiles.Profile long getDynamicRangeProfile() {















        return mOutputSurface.dynamicRangeProfile;















    }









@@ -118,7 +117,6 @@ public final class CameraOutputSurface {













     * unless specified by CameraOutputSurface.setColorSpace.















     */















    @SuppressLint("MethodNameUnits")













    @FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)















    public int getColorSpace() {















        return mOutputSurface.colorSpace;















    }









@@ -128,7 +126,6 @@ public final class CameraOutputSurface {













     * will be {@link android.hardware.camera2.params.DynamicRangeProfiles.STANDARD}















     * unless explicitly set using this method.















     */













    @FlaggedApi(Flags.FLAG_EXTENSION_10_BIT)















    public void setDynamicRangeProfile(















            @DynamicRangeProfiles.Profile long dynamicRangeProfile) {















        mOutputSurface.dynamicRangeProfile = dynamicRangeProfile;