Snap for 8438558 from a0c6fe477be5debb71126aab86b6ed7b0d5e9293 to tm-qpr1-release (e0b3a43d) · Commits · e / os / android_frameworks_base

apct-tests/perftests/core/src/android/libcore/AdditionPerfTest.java

+8 −16

Original line number	Diff line number	Diff line
		@@ -37,79 +37,71 @@ public class AdditionPerfTest {
		public PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();

		@Test
		public int timeAddConstantToLocalInt() {
		public void timeAddConstantToLocalInt() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		int result = 0;
		while (state.keepRunning()) {
		result += 123;
		}
		return result;
		}
		@Test
		public int timeAddTwoLocalInts() {
		public void timeAddTwoLocalInts() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		int result = 0;
		int constant = 123;
		while (state.keepRunning()) {
		result += constant;
		}
		return result;
		}
		@Test
		public long timeAddConstantToLocalLong() {
		public void timeAddConstantToLocalLong() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		long result = 0;
		while (state.keepRunning()) {
		result += 123L;
		}
		return result;
		}
		@Test
		public long timeAddTwoLocalLongs() {
		public void timeAddTwoLocalLongs() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		long result = 0;
		long constant = 123L;
		while (state.keepRunning()) {
		result += constant;
		}
		return result;
		}
		@Test
		public float timeAddConstantToLocalFloat() {
		public void timeAddConstantToLocalFloat() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		float result = 0.0f;
		while (state.keepRunning()) {
		result += 123.0f;
		}
		return result;
		}
		@Test
		public float timeAddTwoLocalFloats() {
		public void timeAddTwoLocalFloats() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		float result = 0.0f;
		float constant = 123.0f;
		while (state.keepRunning()) {
		result += constant;
		}
		return result;
		}
		@Test
		public double timeAddConstantToLocalDouble() {
		public void timeAddConstantToLocalDouble() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		double result = 0.0;
		while (state.keepRunning()) {
		result += 123.0;
		}
		return result;
		}
		@Test
		public double timeAddTwoLocalDoubles() {
		public void timeAddTwoLocalDoubles() {
		BenchmarkState state = mPerfStatusReporter.getBenchmarkState();
		double result = 0.0;
		double constant = 123.0;
		while (state.keepRunning()) {
		result += constant;
		}
		return result;
		}
		}

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1387,6 +1387,7 @@ public class JobSchedulerService extends com.android.server.SystemService
		if (mPendingJobQueue.remove(cancelled)) {
		mJobPackageTracker.noteNonpending(cancelled);
		}
		mChangedJobList.remove(cancelled);
		// Cancel if running.
		mConcurrencyManager.stopJobOnServiceContextLocked(
		cancelled, reason, internalReasonCode, debugReason);

core/java/android/app/TEST_MAPPING

+9 −10

Original line number	Diff line number	Diff line
		@@ -159,6 +159,15 @@
		}
		],
		"file_patterns": ["(/\|^)ContextImpl.java"]
		},
		{
		"file_patterns": ["(/\|^)LocaleManager.java"],
		"name": "CtsLocaleManagerTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		],
		"presubmit-large": [
		@@ -186,16 +195,6 @@
		{
		"file_patterns": ["(/\|^)ActivityThreadTest.java"],
		"name": "FrameworksCoreTests"
		},
		// TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
		{
		"file_patterns": ["(/\|^)LocaleManager.java"],
		"name": "CtsLocaleManagerTestCases",
		"options": [
		{
		"exclude-annotation": "androidx.test.filters.FlakyTest"
		}
		]
		}
		]
		}

core/java/android/net/Ikev2VpnProfile.java

+12 −12

Original line number	Diff line number	Diff line
		@@ -824,9 +824,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		* authentication method may be set. This method will overwrite any previously set
		* authentication method.
		*
		* <p>It's not allowed to set this if this {@link Builder} is constructed from an
		* {@link IkeTunnelConnectionParams}. This information should be retrieved from
		* {@link IkeTunnelConnectionParams}
		* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
		* authentication details should be configured there, and calling this method will result
		* in an exception being thrown.
		*
		* @param user the username to be used for EAP-MSCHAPv2 authentication
		* @param pass the password to be used for EAP-MSCHAPv2 authentication
		@@ -864,9 +864,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		* Only one authentication method may be set. This method will overwrite any previously set
		* authentication method.
		*
		* <p>It's not allowed to set this if this {@link Builder} is constructed from an
		* {@link IkeTunnelConnectionParams}. This information should be retrieved from
		* {@link IkeTunnelConnectionParams}
		* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
		* authentication details should be configured there, and calling this method will result in
		* an exception being thrown.
		*
		* @param userCert the username to be used for RSA Digital signiture authentication
		* @param key the PrivateKey instance associated with the user ceritificate, used for
		@@ -906,9 +906,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		* authentication method may be set. This method will overwrite any previously set
		* authentication method.
		*
		* <p>It's not allowed to set this if this {@link Builder} is constructed from an
		* {@link IkeTunnelConnectionParams}. This information should be retrieved from
		* {@link IkeTunnelConnectionParams}
		* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
		* authentication details should be configured there, and calling this method will result in
		* an exception being thrown.
		*
		* @param psk the key to be used for Pre-Shared Key authentication
		* @return this {@link Builder} object to facilitate chaining of method calls
		@@ -1042,9 +1042,9 @@ public final class Ikev2VpnProfile extends PlatformVpnProfile {
		* Authentication, and one that provides Encryption. Authenticated Encryption with
		* Associated Data (AEAD) algorithms provide both Authentication and Encryption.
		*
		* <p>It's not allowed to set this if this {@link Builder} is constructed from an
		* {@link IkeTunnelConnectionParams}. This information should be retrieved from
		* {@link IkeTunnelConnectionParams}
		* <p>If this {@link Builder} is constructed with an {@link IkeTunnelConnectionParams},
		* authentication details should be configured there, and calling this method will result in
		* an exception being thrown.
		*
		* <p>By default, this profile will use any algorithm defined in {@link IpSecAlgorithm},
		* with the exception of those considered insecure (as described above).

core/java/android/provider/Settings.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -4518,13 +4518,6 @@ public final class Settings {
		@Readable
		public static final String SCREEN_OFF_TIMEOUT = "screen_off_timeout";

		/**
		* The amount of time in milliseconds before the device goes to sleep or begins to dream
		* after a period of inactivity while it is docked.
		* @hide
		*/
		public static final String SCREEN_OFF_TIMEOUT_DOCKED = "screen_off_timeout_docked";

		/**
		* The screen backlight brightness between 0 and 255.
		*/