Snap for 8548586 from baf76a11735fdcb2a43405da42eb0eb020227eb3 to tm-qpr1-release (06542326) · Commits · e / os / android_frameworks_base

core/java/android/app/TEST_MAPPING

+0 −13

Original line number	Diff line number	Diff line
		@@ -110,19 +110,6 @@
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		},
		// TODO(b/225076204): Remove the following four test cases after fixing the test fail.
		{
		"exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess"
		},
		{
		"exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromExternalSource_success"
		},
		{
		"exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess"
		},
		{
		"exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromMic_success"
		}
		],
		"file_patterns": ["(/\|^)VoiceInteract[^/]*"]

core/java/android/app/admin/DevicePolicyResources.java

+35 −15

Original line number	Diff line number	Diff line
		@@ -862,12 +862,6 @@ public final class DevicePolicyResources {
		public static final String REMOVE_AND_UNINSTALL_DEVICE_ADMIN =
		PREFIX + "REMOVE_AND_UNINSTALL_DEVICE_ADMIN";

		/**
		* Title for selecting device admin apps
		*/
		public static final String SELECT_DEVICE_ADMIN_APPS =
		PREFIX + "SELECT_DEVICE_ADMIN_APPS";

		/**
		* Message when there are no available device admin apps to display
		*/
		@@ -909,11 +903,6 @@ public final class DevicePolicyResources {
		public static final String ACTIVE_DEVICE_ADMIN_WARNING =
		PREFIX + "ACTIVE_DEVICE_ADMIN_WARNING";

		/**
		* Title for screen to set a profile owner
		*/
		public static final String SET_PROFILE_OWNER_TITLE = PREFIX + "SET_PROFILE_OWNER_TITLE";

		/**
		* Simplified title for dialog to set a profile owner
		*/
		@@ -1173,7 +1162,8 @@ public final class DevicePolicyResources {
		/**
		* Header for items under the personal user
		*/
		public static final String PERSONAL_CATEGORY_HEADER = PREFIX + "CATEGORY_PERSONAL";
		public static final String PERSONAL_CATEGORY_HEADER =
		PREFIX + "PERSONAL_CATEGORY_HEADER";

		/**
		* Text to indicate work notification content will be shown on the lockscreen.
		@@ -1196,8 +1186,7 @@ public final class DevicePolicyResources {
		/**
		* Text for toggle to enable auto-sycing work data
		*/
		public static final String AUTO_SYNC_WORK_DATA = PREFIX
		+ "AUTO_SYNC_WORK_DATA";
		public static final String AUTO_SYNC_WORK_DATA = PREFIX + "AUTO_SYNC_WORK_DATA";

		/**
		* Summary for "More security settings" section when a work profile is on the device.
		@@ -1212,11 +1201,18 @@ public final class DevicePolicyResources {
		public static final String LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE = PREFIX
		+ "LOCK_SETTINGS_NEW_PROFILE_LOCK_TITLE";

		/**
		* Title for screen asking the user to update the type of screen lock (such as a
		* pattern, PIN, or password) that they need to enter to use their work apps
		*/
		public static final String LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE = PREFIX
		+ "LOCK_SETTINGS_UPDATE_PROFILE_LOCK_TITLE";

		/**
		* Title for section listing information that can be seen by organization
		*/
		public static final String INFORMATION_SEEN_BY_ORGANIZATION_TITLE = PREFIX
		+ "information_seen_by_organization_title";
		+ "INFORMATION_SEEN_BY_ORGANIZATION_TITLE";

		/**
		* Title for section listing changes made by the organization.
		@@ -1229,6 +1225,30 @@ public final class DevicePolicyResources {
		*/
		public static final String ENTERPRISE_PRIVACY_FOOTER =
		PREFIX + "ENTERPRISE_PRIVACY_FOOTER";

		/**
		* Title for spell checker settings for work.
		*/
		public static final String SPELL_CHECKER_FOR_WORK =
		PREFIX + "SPELL_CHECKER_FOR_WORK";

		/**
		* Title for personal dictionary for work settings.
		*/
		public static final String PERSONAL_DICTIONARY_FOR_WORK =
		PREFIX + "PERSONAL_DICTIONARY_FOR_WORK";

		/**
		* Summary for switch preference to indicate it is disabled by the admin
		*/
		public static final String DISABLED_BY_ADMIN_SWITCH_SUMMARY =
		PREFIX + "DISABLED_BY_ADMIN_SWITCH_SUMMARY";

		/**
		* Summary for switch preference to indicate it is enabled by the admin
		*/
		public static final String ENABLED_BY_ADMIN_SWITCH_SUMMARY =
		PREFIX + "ENABLED_BY_ADMIN_SWITCH_SUMMARY";
		}

		/**

core/java/android/content/Context.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -513,9 +513,22 @@ public abstract class Context {
		* restart. There is no guarantee this will be respected, as the system
		* tries to balance such requests from one app vs. the importance of
		* keeping other apps around.
		*
		* @deprecated Repurposed to {@link #BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE}.
		*/
		@Deprecated
		public static final int BIND_VISIBLE = 0x10000000;

		/**
		* @hide Flag for {@link #bindService}: Treat the binding as hosting a foreground service
		* and also visible to the user. That is, the app hosting the service will get its process state
		* bumped to the {@link android.app.ActivityManager#PROCESS_STATE_FOREGROUND_SERVICE},
		* and it's considered as visible to the user, thus less likely to be expunged from memory
		* on low memory situations. This is intented for use by processes with the process state
		* better than the {@link android.app.ActivityManager#PROCESS_STATE_TOP}.
		*/
		public static final int BIND_TREAT_LIKE_VISIBLE_FOREGROUND_SERVICE = 0x10000000;

		/**
		* @hide
		* Flag for {@link #bindService}: Consider this binding to be causing the target

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

+20 −18

Original line number	Diff line number	Diff line
		@@ -1058,7 +1058,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* must select one unique size from this metadata to use (e.g., preview and recording streams
		* must have the same size). Otherwise, the high speed capture session creation will fail.</p>
		* <p>The min and max fps will be multiple times of 30fps.</p>
		* <p>High speed video streaming extends significant performance pressue to camera hardware,
		* <p>High speed video streaming extends significant performance pressure to camera hardware,
		* to achieve efficient high speed streaming, the camera device may have to aggregate
		* multiple frames together and send to camera device for processing where the request
		* controls are same for all the frames in this batch. Max batch size indicates
		@@ -1143,7 +1143,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>Range of boosts for {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost} supported
		* by this camera device.</p>
		* <p>Devices support post RAW sensitivity boost will advertise
		* {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost} key for controling
		* {@link CaptureRequest#CONTROL_POST_RAW_SENSITIVITY_BOOST android.control.postRawSensitivityBoost} key for controlling
		* post RAW sensitivity boost.</p>
		* <p>This key will be <code>null</code> for devices that do not support any RAW format
		* outputs. For devices that do support RAW format outputs, this key will always
		@@ -1323,7 +1323,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* <p>Maximum flashlight brightness level.</p>
		* <p>If this value is greater than 1, then the device supports controlling the
		* flashlight brightness level via
		* {android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.
		* {@link android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel }.
		* If this value is equal to 1, flashlight brightness control is not supported.
		* The value for this key will be null for devices with no flash unit.</p>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		@@ -1335,7 +1335,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri

		/**
		* <p>Default flashlight brightness level to be set via
		* {android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel}.</p>
		* {@link android.hardware.camera2.CameraManager#turnOnTorchWithStrengthLevel }.</p>
		* <p>If flash unit is available this will be greater than or equal to 1 and less
		* or equal to <code>{@link CameraCharacteristics#FLASH_INFO_STRENGTH_MAXIMUM_LEVEL android.flash.info.strengthMaximumLevel}</code>.</p>
		* <p>Setting flashlight brightness above the default level
		@@ -1376,7 +1376,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* camera device.</p>
		* <p>This list will include at least one non-zero resolution, plus <code>(0,0)</code> for indicating no
		* thumbnail should be generated.</p>
		* <p>Below condiditions will be satisfied for this size list:</p>
		* <p>Below conditions will be satisfied for this size list:</p>
		* <ul>
		* <li>The sizes will be sorted by increasing pixel area (width x height).
		* If several resolutions have the same area, they will be sorted by increasing width.</li>
		@@ -1982,7 +1982,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* the camera device. Using more streams simultaneously may require more hardware and
		* CPU resources that will consume more power. The image format for an output stream can
		* be any supported format provided by android.scaler.availableStreamConfigurations.
		* The formats defined in android.scaler.availableStreamConfigurations can be catergorized
		* The formats defined in android.scaler.availableStreamConfigurations can be categorized
		* into the 3 stream types as below:</p>
		* <ul>
		* <li>Processed (but stalling): any non-RAW format with a stallDurations > 0.
		@@ -2324,7 +2324,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* but clients should be aware and expect delays during their application.
		* An example usage scenario could look like this:</p>
		* <ul>
		* <li>The camera client starts by quering the session parameter key list via
		* <li>The camera client starts by querying the session parameter key list via
		* {@link android.hardware.camera2.CameraCharacteristics#getAvailableSessionKeys }.</li>
		* <li>Before triggering the capture session create sequence, a capture request
		* must be built via
		@@ -2379,7 +2379,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* {@link android.hardware.camera2.CameraCharacteristics#getKeys } that require camera clients
		* to acquire the {@link android.Manifest.permission#CAMERA } permission before calling
		* {@link android.hardware.camera2.CameraManager#getCameraCharacteristics }. If the
		* permission is not held by the camera client, then the values of the repsective properties
		* permission is not held by the camera client, then the values of the respective properties
		* will not be present in {@link android.hardware.camera2.CameraCharacteristics }.</p>
		* <p>This key is available on all devices.</p>
		* @hide
		@@ -2759,7 +2759,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device declares to be
		* media performance class 12 or higher by setting
		* {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* {@link android.os.Build.VERSION_CODES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* the primary camera devices (first rear/front camera in the camera ID list) will not
		* support JPEG sizes smaller than 1080p. If the application configures a JPEG stream
		* smaller than 1080p, the camera device will round up the JPEG image size to at least
		@@ -2833,7 +2833,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* </table>
		* <p>For applications targeting SDK version 31 or newer, if the mobile device doesn't declare
		* to be media performance class 12 or better by setting
		* {@link android.os.Build.VERSION_CDOES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* {@link android.os.Build.VERSION_CODES.MEDIA_PERFORMANCE_CLASS } to be 31 or larger,
		* or if the camera device isn't a primary rear/front camera, the minimum required output
		* stream configurations are the same as for applications targeting SDK version older than
		* 31.</p>
		@@ -3485,14 +3485,16 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* to output different resolution images depending on the current active physical camera or
		* pixel mode. With multi-resolution input streams, the camera device can reprocess images
		* of different resolutions from different physical cameras or sensor pixel modes.</p>
		* <p>When set to TRUE:
		* * For a logical multi-camera, the camera framework derives
		* <p>When set to TRUE:</p>
		* <ul>
		* <li>For a logical multi-camera, the camera framework derives
		* {@link CameraCharacteristics#SCALER_MULTI_RESOLUTION_STREAM_CONFIGURATION_MAP android.scaler.multiResolutionStreamConfigurationMap} by combining the
		* android.scaler.physicalCameraMultiResolutionStreamConfigurations from its physical
		* cameras.
		* * For an ultra-high resolution sensor camera, the camera framework directly copies
		* cameras.</li>
		* <li>For an ultra-high resolution sensor camera, the camera framework directly copies
		* the value of android.scaler.physicalCameraMultiResolutionStreamConfigurations to
		* {@link CameraCharacteristics#SCALER_MULTI_RESOLUTION_STREAM_CONFIGURATION_MAP android.scaler.multiResolutionStreamConfigurationMap}.</p>
		* {@link CameraCharacteristics#SCALER_MULTI_RESOLUTION_STREAM_CONFIGURATION_MAP android.scaler.multiResolutionStreamConfigurationMap}.</li>
		* </ul>
		* <p><b>Optional</b> - The value for this key may be {@code null} on some devices.</p>
		* <p><b>Limited capability</b> -
		* Present on all camera devices that report being at least {@link CameraCharacteristics#INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED HARDWARE_LEVEL_LIMITED} devices in the
		@@ -3513,7 +3515,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* capture, video record for encoding the camera output for the purpose of future playback,
		* and video call for live realtime video conferencing.</p>
		* <p>With this flag, the camera device can optimize the image processing pipeline
		* parameters, such as tuning, sensor mode, and ISP settings, indepedent of
		* parameters, such as tuning, sensor mode, and ISP settings, independent of
		* the properties of the immediate camera output surface. For example, if the output
		* surface is a SurfaceTexture, the stream use case flag can be used to indicate whether
		* the camera frames eventually go to display, video encoder,
		@@ -3535,7 +3537,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* {@link android.hardware.camera2.CameraCharacteristics#REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE }
		* capability is documented in the camera device
		* {@link android.hardware.camera2.CameraDevice#createCaptureSession guideline}. The
		* application is strongly recommended to use one of the guaranteed stream combintations.
		* application is strongly recommended to use one of the guaranteed stream combinations.
		* If the application creates a session with a stream combination not in the guaranteed
		* list, or with mixed DEFAULT and non-DEFAULT use cases within the same session,
		* the camera device may ignore some stream use cases due to hardware constraints
		@@ -5209,7 +5211,7 @@ public final class CameraCharacteristics extends CameraMetadata<CameraCharacteri
		* EXTERIOR_* value.</p>
		* <p>If a camera has INTERIOR_OTHER or EXTERIOR_OTHER, or more than one camera is at the
		* same location and facing the same direction, their static metadata will list the
		* following entries, so that applications can determain their lenses' exact facing
		* following entries, so that applications can determine their lenses' exact facing
		* directions:</p>
		* <ul>
		* <li>{@link CameraCharacteristics#LENS_POSE_REFERENCE android.lens.poseReference}</li>

core/java/android/hardware/camera2/CameraMetadata.java

+57 −49

File changed.

Preview size limit exceeded, changes collapsed.