Snap for 11967491 from b6325f3a5833937ae7a92e36779f296f95b0c705 to 24Q3-release (f5565fca) · Commits · e / os / android_frameworks_base

Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,7 @@ filegroup {
		":android.security.legacykeystore-java-source",
		":android.security.maintenance-java-source",
		":android.security.metrics-java-source",
		":android.system.keystore2-V3-java-source",
		":android.system.keystore2-V4-java-source",
		":android.hardware.cas-V1-java-source",
		":credstore_aidl",
		":dumpstate_aidl",

PREUPLOAD.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,4 +33,4 @@ ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py --no-verify-format -f ${PR
		flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PROJECT}

		[Tool Paths]
		ktfmt = ${REPO_ROOT}/prebuilts/build-tools/common/framework/ktfmt.jar
		ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

apct-tests/perftests/core/src/android/permission/AppOpsPerfTest.kt

+4 −5

Original line number	Diff line number	Diff line
		@@ -17,8 +17,7 @@ package android.permission

		import android.app.AppOpsManager
		import android.content.Context
		import androidx.benchmark.BenchmarkState
		import androidx.benchmark.junit4.BenchmarkRule
		import android.perftests.utils.PerfStatusReporter
		import androidx.test.core.app.ApplicationProvider
		import androidx.test.filters.LargeTest
		import org.junit.Before
		@@ -34,7 +33,7 @@ import org.junit.Test
		* these APIs should be monitored closely for performance.
		*/
		class AppOpsPerfTest {
		@get:Rule val mBenchmarkRule: BenchmarkRule = BenchmarkRule()
		@get:Rule val perfStatusReporter = PerfStatusReporter()
		private lateinit var appOpsManager: AppOpsManager
		private lateinit var opPackageName: String
		private var opPackageUid: Int = 0
		@@ -49,7 +48,7 @@ class AppOpsPerfTest {

		@Test
		fun testNoteOp() {
		val state: BenchmarkState = mBenchmarkRule.getState()
		val state = perfStatusReporter.benchmarkState
		while (state.keepRunning()) {
		appOpsManager.noteOp(
		AppOpsManager.OPSTR_FINE_LOCATION,
		@@ -63,7 +62,7 @@ class AppOpsPerfTest {

		@Test
		fun testUnsafeCheckOp() {
		val state: BenchmarkState = mBenchmarkRule.getState()
		val state = perfStatusReporter.benchmarkState
		while (state.keepRunning()) {
		appOpsManager.unsafeCheckOp(
		AppOpsManager.OPSTR_FINE_LOCATION,

cmds/uiautomator/library/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ droidstubs {
		],
		installable: false,
		flags: [
		"-stubpackages com.android.uiautomator.core:com.android.uiautomator.testrunner",
		"--stub-packages com.android.uiautomator.core:com.android.uiautomator.testrunner",
		],

		check_api: {

core/api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -15974,6 +15974,7 @@ package android.graphics {
		enum_constant public static final android.graphics.ColorSpace.Named LINEAR_EXTENDED_SRGB;
		enum_constant public static final android.graphics.ColorSpace.Named LINEAR_SRGB;
		enum_constant public static final android.graphics.ColorSpace.Named NTSC_1953;
		enum_constant @FlaggedApi("com.android.graphics.flags.ok_lab_colorspace") public static final android.graphics.ColorSpace.Named OK_LAB;
		enum_constant public static final android.graphics.ColorSpace.Named PRO_PHOTO_RGB;
		enum_constant public static final android.graphics.ColorSpace.Named SMPTE_C;
		enum_constant public static final android.graphics.ColorSpace.Named SRGB;
		@@ -19910,7 +19911,6 @@ package android.hardware.camera2 {
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureRequest {
		ctor public ExtensionCaptureRequest();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureRequest.Key<java.lang.Float> EFV_PADDING_ZOOM_FACTOR;
		@@ -19923,7 +19923,6 @@ package android.hardware.camera2 {
		}

		@FlaggedApi("com.android.internal.camera.flags.concert_mode_api") public final class ExtensionCaptureResult {
		ctor public ExtensionCaptureResult();
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Boolean> EFV_AUTO_ZOOM;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<int[]> EFV_AUTO_ZOOM_PADDING_REGION;
		field @FlaggedApi("com.android.internal.camera.flags.concert_mode_api") @NonNull public static final android.hardware.camera2.CaptureResult.Key<java.lang.Float> EFV_MAX_PADDING_ZOOM_FACTOR;
		@@ -47134,6 +47133,8 @@ package android.telephony.ims {
		method public int describeContents();
		method public int getAttributeFlags();
		method @NonNull public java.util.Set<java.lang.String> getFeatureTags();
		method @FlaggedApi("com.android.internal.telephony.flags.emergency_registration_state") public boolean getFlagRegistrationTypeEmergency();
		method @FlaggedApi("com.android.internal.telephony.flags.emergency_registration_state") public boolean getFlagVirtualRegistrationForEmergencyCall();
		method @Nullable public android.telephony.ims.SipDetails getSipDetails();
		method public int getTransportType();
		method public void writeToParcel(@NonNull android.os.Parcel, int);