Snap for 8519467 from 3137c78e1bd366d6f34796b25181f7566bc29766 to tm-release (33d81641) · Commits · e / os / android_frameworks_base

api/api.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -208,12 +208,6 @@ func createMergedFrameworkImpl(ctx android.LoadHookContext, modules []string) {
		props := libraryProps{}
		props.Name = proptools.StringPtr("all-framework-module-impl")
		props.Static_libs = transformArray(modules, "", ".impl")
		// Media module's impl jar is called "updatable-media"
		for i, v := range props.Static_libs {
		if v == "framework-media.impl" {
		props.Static_libs[i] = "updatable-media"
		}
		}
		props.Sdk_version = proptools.StringPtr("module_current")
		props.Visibility = []string{"//frameworks/base"}
		ctx.CreateModule(java.LibraryFactory, &props)

core/java/android/content/pm/TEST_MAPPING

+35 −0

Original line number	Diff line number	Diff line
		@@ -186,5 +186,40 @@
		}
		]
		}
		],
		"platinum-postsubmit": [
		{
		"name": "CtsIncrementalInstallHostTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsAppSecurityHostTestCases",
		"options": [
		{
		"include-filter": "android.appsecurity.cts.SplitTests"
		},
		{
		"include-filter": "android.appsecurity.cts.EphemeralTest"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		},
		{
		"name": "CtsContentTestCases",
		"options":[
		{
		"include-filter": "android.content.cts.IntentFilterTest"
		},
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}

core/java/android/content/pm/verify/domain/TEST_MAPPING

+0 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,6 @@
		{
		"name": "CtsDomainVerificationDeviceStandaloneTestCases"
		},
		{
		"name": "CtsDomainVerificationDeviceMultiUserTestCases"
		},
		{
		"name": "CtsDomainVerificationHostTestCases"
		}

core/java/android/hardware/camera2/params/OutputConfiguration.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -224,9 +224,10 @@ public final class OutputConfiguration implements Parcelable {
		* display subsystem for smoother display of camera frames. An output target of SurfaceView
		* uses this time base by default.</p>
		*
		* <p>The choreographer synchronized timestamps are also reasonable to use when drawing to a
		* TextureView. So this timestamp base can be used for a SurfaceTexture as part of a
		* TextureView, in addition to SurfaceView.</p>
		* <p>This timestamp base isn't applicable to SurfaceTexture targets. SurfaceTexture's
		* {@link android.graphics.SurfaceTexture#updateTexImage updateTexImage} function always
		* uses the latest image from the camera stream. In the case of a TextureView, the image is
		* displayed right away.</p>
		*
		* <p>Timestamps with this time base cannot directly match the timestamps in
		* {@link CameraCaptureSession.CaptureCallback#onCaptureStarted} or the sensor timestamps in

core/java/android/provider/Settings.java

+35 −14

Original line number	Diff line number	Diff line
		@@ -7678,20 +7678,6 @@ public final class Settings {
		public static final String ZEN_SETTINGS_SUGGESTION_VIEWED =
		"zen_settings_suggestion_viewed";

		/**
		* State of whether review notification permissions notification needs to
		* be shown the user, and whether the user has interacted.
		*
		* Valid values:
		* -1 = UNKNOWN
		* 0 = SHOULD_SHOW
		* 1 = USER_INTERACTED
		* 2 = DISMISSED
		* @hide
		*/
		public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE =
		"review_permissions_notification_state";

		/**
		* Whether the in call notification is enabled to play sound during calls. The value is
		* boolean (1 or 0).
		@@ -9695,6 +9681,26 @@ public final class Settings {
		@Readable
		public static final String BIOMETRIC_APP_ENABLED = "biometric_app_enabled";

		/**
		* Whether or not active unlock triggers on wake.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_WAKE = "active_unlock_on_wake";

		/**
		* Whether or not active unlock triggers on unlock intent.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_UNLOCK_INTENT =
		"active_unlock_on_unlock_intent";

		/**
		* Whether or not active unlock triggers on biometric failure.
		* @hide
		*/
		public static final String ACTIVE_UNLOCK_ON_BIOMETRIC_FAIL =
		"active_unlock_on_biometric_fail";

		/**
		* Whether the assist gesture should be enabled.
		*
		@@ -16965,6 +16971,21 @@ public final class Settings {
		public static final String MANAGED_PROVISIONING_DEFER_PROVISIONING_TO_ROLE_HOLDER =
		"managed_provisioning_defer_provisioning_to_role_holder";

		/**
		* State of whether review notification permissions notification needs to
		* be shown the user, and whether the user has interacted.
		*
		* Valid values:
		* -1 = UNKNOWN
		* 0 = SHOULD_SHOW
		* 1 = USER_INTERACTED
		* 2 = DISMISSED
		* 3 = RESHOWN
		* @hide
		*/
		public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE =
		"review_permissions_notification_state";

		/**
		* Settings migrated from Wear OS settings provider.
		* @hide