Snap for 6670641 from 56ec0b95bce078b6d80130242152a2a9e8f5a20f to rvc-qpr1-release (3e93ffd6) · Commits · e / os / android_frameworks_base

PREUPLOAD.cfg

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -12,8 +12,6 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
	services/incremental/		services/incremental/

	[Hook Scripts]		[Hook Scripts]
	checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

	strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}		strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_sha.sh ${PREUPLOAD_COMMIT}

	hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}		hidden_api_txt_checksorted_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}

core/java/android/content/IntentFilter.java

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1168,8 +1168,13 @@ public class IntentFilter implements Parcelable {
	public int match(Uri data, boolean wildcardSupported) {		public int match(Uri data, boolean wildcardSupported) {
	String host = data.getHost();		String host = data.getHost();
	if (host == null) {		if (host == null) {
			if (wildcardSupported && mWild) {
			// special case, if no host is provided, but the Authority is wildcard, match
			return MATCH_CATEGORY_HOST;
			} else {
	return NO_MATCH_DATA;		return NO_MATCH_DATA;
	}		}
			}
	if (false) Log.v("IntentFilter",		if (false) Log.v("IntentFilter",
	"Match host " + host + ": " + mHost);		"Match host " + host + ": " + mHost);
	if (!wildcardSupported \|\| !WILDCARD.equals(host)) {		if (!wildcardSupported \|\| !WILDCARD.equals(host)) {

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1510,7 +1510,7 @@ public class ParsingPackageUtils {

	Uri data = null;		Uri data = null;
	String dataType = null;		String dataType = null;
	String host = IntentFilter.WILDCARD;		String host = null;
	final int numActions = intentInfo.countActions();		final int numActions = intentInfo.countActions();
	final int numSchemes = intentInfo.countDataSchemes();		final int numSchemes = intentInfo.countDataSchemes();
	final int numTypes = intentInfo.countDataTypes();		final int numTypes = intentInfo.countDataTypes();

core/java/android/net/MacAddress.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -38,7 +38,9 @@ import java.util.Arrays;
	* Representation of a MAC address.		* Representation of a MAC address.
	*		*
	* This class only supports 48 bits long addresses and does not support 64 bits long addresses.		* This class only supports 48 bits long addresses and does not support 64 bits long addresses.
	* Instances of this class are immutable.		* Instances of this class are immutable. This class provides implementations of hashCode()
			* and equals() that make it suitable for use as keys in standard implementations of
			* {@link java.util.Map}.
	*/		*/
	public final class MacAddress implements Parcelable {		public final class MacAddress implements Parcelable {

	@@ -122,12 +124,22 @@ public final class MacAddress implements Parcelable {
	}		}

	/**		/**
			* Convert this MacAddress to a byte array.
			*
			* The returned array is in network order. For example, if this MacAddress is 1:2:3:4:5:6,
			* the returned array is [1, 2, 3, 4, 5, 6].
			*
	* @return a byte array representation of this MacAddress.		* @return a byte array representation of this MacAddress.
	*/		*/
	public @NonNull byte[] toByteArray() {		public @NonNull byte[] toByteArray() {
	return byteAddrFromLongAddr(mAddr);		return byteAddrFromLongAddr(mAddr);
	}		}

			/**
			* Returns a human-readable representation of this MacAddress.
			* The exact format is implementation-dependent and should not be assumed to have any
			* particular format.
			*/
	@Override		@Override
	public @NonNull String toString() {		public @NonNull String toString() {
	return stringAddrFromLongAddr(mAddr);		return stringAddrFromLongAddr(mAddr);

core/java/android/view/InsetsController.java

+20 −6

Original line number	Original line	Diff line number	Diff line
	@@ -737,7 +737,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
	}		}
	}		}

	final boolean hasControl = mTmpControlArray.size() > 0;		boolean requestedStateStale = false;
	final int[] showTypes = new int[1];		final int[] showTypes = new int[1];
	final int[] hideTypes = new int[1];		final int[] hideTypes = new int[1];

	@@ -754,9 +754,26 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
	// Ensure to create source consumers if not available yet.		// Ensure to create source consumers if not available yet.
	for (int i = mTmpControlArray.size() - 1; i >= 0; i--) {		for (int i = mTmpControlArray.size() - 1; i >= 0; i--) {
	final InsetsSourceControl control = mTmpControlArray.valueAt(i);		final InsetsSourceControl control = mTmpControlArray.valueAt(i);
	InsetsSourceConsumer consumer = getSourceConsumer(control.getType());		final @InternalInsetsType int type = control.getType();
			final InsetsSourceConsumer consumer = getSourceConsumer(type);
	consumer.setControl(control, showTypes, hideTypes);		consumer.setControl(control, showTypes, hideTypes);

			if (!requestedStateStale) {
			final boolean requestedVisible = consumer.isRequestedVisible();

			// We might have changed our requested visibilities while we don't have the control,
			// so we need to update our requested state once we have control. Otherwise, our
			// requested state at the server side might be incorrect.
			final boolean requestedVisibilityChanged =
			requestedVisible != mRequestedState.getSourceOrDefaultVisibility(type);

			// The IME client visibility will be reset by insets source provider while updating
			// control, so if IME is requested visible, we need to send the request to server.
			final boolean imeRequestedVisible = type == ITYPE_IME && requestedVisible;

			requestedStateStale = requestedVisibilityChanged \|\| imeRequestedVisible;
			}

	}		}
	mTmpControlArray.clear();		mTmpControlArray.clear();

	@@ -772,10 +789,7 @@ public class InsetsController implements WindowInsetsController, InsetsAnimation
	if (hideTypes[0] != 0) {		if (hideTypes[0] != 0) {
	applyAnimation(hideTypes[0], false /* show /, false / fromIme */);		applyAnimation(hideTypes[0], false /* show /, false / fromIme */);
	}		}
	if (hasControl && mRequestedState.hasSources()) {		if (requestedStateStale) {
	// We might have changed our requested visibilities while we don't have the control,
	// so we need to update our requested state once we have control. Otherwise, our
	// requested state at the server side might be incorrect.
	updateRequestedState();		updateRequestedState();
	}		}
	}		}