Snap for 9892340 from 775a0c6360800bf95e27f2a5273d238a409a0866 to tm-qpr3-release (ae3eb2c2) · Commits · e / os / android_frameworks_base

core/java/android/app/admin/DevicePolicyManager.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -9188,7 +9188,8 @@ public class DevicePolicyManager {
		* @see #isProfileOwnerApp
		* @see #isDeviceOwnerApp
		* @param admin Which {@link DeviceAdminReceiver} this request is associate with.
		* @param profileName The name of the profile.
		* @param profileName The name of the profile. If the name is longer than 200 characters
		* it will be truncated.
		* @throws SecurityException if {@code admin} is not a device or profile owner.
		*/
		public void setProfileName(@NonNull ComponentName admin, String profileName) {

core/java/android/service/notification/ZenModeConfig.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -1008,9 +1008,8 @@ public class ZenModeConfig implements Parcelable {
		.allowAlarms(allowAlarms)
		.allowMedia(allowMedia)
		.allowSystem(allowSystem)
		.allowConversations(allowConversations
		? ZenModeConfig.getZenPolicySenders(allowConversationsFrom)
		: ZenPolicy.PEOPLE_TYPE_NONE);
		.allowConversations(allowConversations ? allowConversationsFrom
		: ZenPolicy.CONVERSATION_SENDERS_NONE);
		if (suppressedVisualEffects == 0) {
		builder.showAllVisualEffects();
		} else {

core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,11 @@ public class ApkSignatureSchemeV2Verifier {

		private static final int APK_SIGNATURE_SCHEME_V2_BLOCK_ID = 0x7109871a;

		/**
		* The maximum number of signers supported by the v2 APK signature scheme.
		*/
		private static final int MAX_V2_SIGNERS = 10;

		/**
		* Returns {@code true} if the provided APK contains an APK Signature Scheme V2 signature.
		*
		@@ -182,6 +187,11 @@ public class ApkSignatureSchemeV2Verifier {
		}
		while (signers.hasRemaining()) {
		signerCount++;
		if (signerCount > MAX_V2_SIGNERS) {
		throw new SecurityException(
		"APK Signature Scheme v2 only supports a maximum of " + MAX_V2_SIGNERS
		+ " signers");
		}
		try {
		ByteBuffer signer = getLengthPrefixedSlice(signers);
		X509Certificate[] certs = verifySigner(signer, contentDigests, certFactory);

core/java/android/util/jar/StrictJarVerifier.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,11 @@ class StrictJarVerifier {
		"SHA1",
		};

		/**
		* The maximum number of signers supported by the JAR signature scheme.
		*/
		private static final int MAX_JAR_SIGNERS = 10;

		private final String jarName;
		private final StrictJarManifest manifest;
		private final HashMap<String, byte[]> metaEntries;
		@@ -293,10 +298,16 @@ class StrictJarVerifier {
		return false;
		}

		int signerCount = 0;
		Iterator<String> it = metaEntries.keySet().iterator();
		while (it.hasNext()) {
		String key = it.next();
		if (key.endsWith(".DSA") \|\| key.endsWith(".RSA") \|\| key.endsWith(".EC")) {
		if (++signerCount > MAX_JAR_SIGNERS) {
		throw new SecurityException(
		"APK Signature Scheme v1 only supports a maximum of " + MAX_JAR_SIGNERS
		+ " signers");
		}
		verifyCertificate(key);
		it.remove();
		}

core/java/android/view/WindowManager.java

+36 −0

Original line number	Diff line number	Diff line
		@@ -852,6 +852,42 @@ public interface WindowManager extends ViewManager {
		String PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION =
		"android.window.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION";

		/**
		* Application level {@link android.content.pm.PackageManager.Property PackageManager.Property}
		* for an app to inform the system that the app can be opted-out from the compatibility
		* treatment that avoids {@link android.app.Activity#setRequestedOrientation} loops. The loop
		* can be trigerred by ignoreRequestedOrientation display setting enabled on the device or
		* by the landscape natural orientation of the device.
		*
		* <p>The system could ignore {@link android.app.Activity#setRequestedOrientation}
		* call from an app if both of the following conditions are true:
		* <ul>
		* <li>Activity has requested orientation more than 2 times within 1-second timer
		* <li>Activity is not letterboxed for fixed orientation
		* </ul>
		*
		* <p>Setting this property to {@code false} informs the system that the app must be
		* opted-out from the compatibility treatment even if the device manufacturer has opted the app
		* into the treatment.
		*
		* <p>Not setting this property at all, or setting this property to {@code true} has no effect.
		*
		* <p><b>Syntax:</b>
		* <pre>
		* <application>
		* <property
		* android:name=
		* "android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED"
		* android:value="false"/>
		* </application>
		* </pre>
		*
		* @hide
		*/
		// TODO(b/274924641): Make this public API.
		String PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED =
		"android.window.PROPERTY_COMPAT_IGNORE_ORIENTATION_REQUEST_WHEN_LOOP_DETECTED";

		/**
		* Application level {@link android.content.pm.PackageManager.Property PackageManager
		* .Property} for an app to inform the system that it needs to be opted-out from the