Merge changes from topic "androidx_prebuilt_roll" (28e5a063) · Commits · e / os / android_frameworks_base

packages/PrintRecommendationService/src/com/android/printservice/recommendation/RemotePrintServicePlugin.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,8 @@ package com.android.printservice.recommendation;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.annotation.StringRes;
		import androidx.core.util.Preconditions;

		import com.android.printservice.recommendation.util.Preconditions;

		import java.net.InetAddress;
		import java.util.Collections;

packages/PrintRecommendationService/src/com/android/printservice/recommendation/plugin/mdnsFilter/VendorConfig.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,9 +22,9 @@ import android.util.ArrayMap;

		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.core.util.Preconditions;

		import com.android.printservice.recommendation.R;
		import com.android.printservice.recommendation.util.Preconditions;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;

packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/MDNSFilteredDiscovery.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@ import android.util.Log;
		import androidx.annotation.GuardedBy;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;
		import androidx.core.util.Preconditions;

		import com.android.printservice.recommendation.PrintServicePlugin;

packages/PrintRecommendationService/src/com/android/printservice/recommendation/util/Preconditions.java

0 → 100644

+532 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2011 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.printservice.recommendation.util;

		import android.text.TextUtils;

		import androidx.annotation.IntRange;
		import androidx.annotation.NonNull;

		import java.util.Collection;

		/**
		* Simple static methods to be called at the start of your own methods to verify
		* correct arguments and state.
		*/
		public class Preconditions {

		public static void checkArgument(boolean expression) {
		if (!expression) {
		throw new IllegalArgumentException();
		}
		}

		/**
		* Ensures that an expression checking an argument is true.
		*
		* @param expression the expression to check
		* @param errorMessage the exception message to use if the check fails; will
		* be converted to a string using {@link String#valueOf(Object)}
		* @throws IllegalArgumentException if {@code expression} is false
		*/
		public static void checkArgument(boolean expression, final Object errorMessage) {
		if (!expression) {
		throw new IllegalArgumentException(String.valueOf(errorMessage));
		}
		}

		/**
		* Ensures that an expression checking an argument is true.
		*
		* @param expression the expression to check
		* @param messageTemplate a printf-style message template to use if the check fails; will
		* be converted to a string using {@link String#format(String, Object...)}
		* @param messageArgs arguments for {@code messageTemplate}
		* @throws IllegalArgumentException if {@code expression} is false
		*/
		public static void checkArgument(boolean expression,
		final String messageTemplate,
		final Object... messageArgs) {
		if (!expression) {
		throw new IllegalArgumentException(String.format(messageTemplate, messageArgs));
		}
		}

		/**
		* Ensures that an string reference passed as a parameter to the calling
		* method is not empty.
		*
		* @param string an string reference
		* @return the string reference that was validated
		* @throws IllegalArgumentException if {@code string} is empty
		*/
		public static @NonNull <T extends CharSequence> T checkStringNotEmpty(final T string) {
		if (TextUtils.isEmpty(string)) {
		throw new IllegalArgumentException();
		}
		return string;
		}

		/**
		* Ensures that an string reference passed as a parameter to the calling
		* method is not empty.
		*
		* @param string an string reference
		* @param errorMessage the exception message to use if the check fails; will
		* be converted to a string using {@link String#valueOf(Object)}
		* @return the string reference that was validated
		* @throws IllegalArgumentException if {@code string} is empty
		*/
		public static @NonNull <T extends CharSequence> T checkStringNotEmpty(final T string,
		final Object errorMessage) {
		if (TextUtils.isEmpty(string)) {
		throw new IllegalArgumentException(String.valueOf(errorMessage));
		}
		return string;
		}

		/**
		* Ensures that an object reference passed as a parameter to the calling
		* method is not null.
		*
		* @param reference an object reference
		* @return the non-null reference that was validated
		* @throws NullPointerException if {@code reference} is null
		*/
		public static @NonNull <T> T checkNotNull(final T reference) {
		if (reference == null) {
		throw new NullPointerException();
		}
		return reference;
		}

		/**
		* Ensures that an object reference passed as a parameter to the calling
		* method is not null.
		*
		* @param reference an object reference
		* @param errorMessage the exception message to use if the check fails; will
		* be converted to a string using {@link String#valueOf(Object)}
		* @return the non-null reference that was validated
		* @throws NullPointerException if {@code reference} is null
		*/
		public static @NonNull <T> T checkNotNull(final T reference, final Object errorMessage) {
		if (reference == null) {
		throw new NullPointerException(String.valueOf(errorMessage));
		}
		return reference;
		}

		/**
		* Ensures that an object reference passed as a parameter to the calling
		* method is not null.
		*
		* @param reference an object reference
		* @param messageTemplate a printf-style message template to use if the check fails; will
		* be converted to a string using {@link String#format(String, Object...)}
		* @param messageArgs arguments for {@code messageTemplate}
		* @return the non-null reference that was validated
		* @throws NullPointerException if {@code reference} is null
		*/
		public static @NonNull <T> T checkNotNull(final T reference,
		final String messageTemplate,
		final Object... messageArgs) {
		if (reference == null) {
		throw new NullPointerException(String.format(messageTemplate, messageArgs));
		}
		return reference;
		}

		/**
		* Ensures the truth of an expression involving the state of the calling
		* instance, but not involving any parameters to the calling method.
		*
		* @param expression a boolean expression
		* @param message exception message
		* @throws IllegalStateException if {@code expression} is false
		*/
		public static void checkState(final boolean expression, String message) {
		if (!expression) {
		throw new IllegalStateException(message);
		}
		}

		/**
		* Ensures the truth of an expression involving the state of the calling
		* instance, but not involving any parameters to the calling method.
		*
		* @param expression a boolean expression
		* @throws IllegalStateException if {@code expression} is false
		*/
		public static void checkState(final boolean expression) {
		checkState(expression, null);
		}

		/**
		* Check the requested flags, throwing if any requested flags are outside
		* the allowed set.
		*
		* @return the validated requested flags.
		*/
		public static int checkFlagsArgument(final int requestedFlags, final int allowedFlags) {
		if ((requestedFlags & allowedFlags) != requestedFlags) {
		throw new IllegalArgumentException("Requested flags 0x"
		+ Integer.toHexString(requestedFlags) + ", but only 0x"
		+ Integer.toHexString(allowedFlags) + " are allowed");
		}

		return requestedFlags;
		}

		/**
		* Ensures that that the argument numeric value is non-negative.
		*
		* @param value a numeric int value
		* @param errorMessage the exception message to use if the check fails
		* @return the validated numeric value
		* @throws IllegalArgumentException if {@code value} was negative
		*/
		public static @IntRange(from = 0) int checkArgumentNonnegative(final int value,
		final String errorMessage) {
		if (value < 0) {
		throw new IllegalArgumentException(errorMessage);
		}

		return value;
		}

		/**
		* Ensures that that the argument numeric value is non-negative.
		*
		* @param value a numeric int value
		*
		* @return the validated numeric value
		* @throws IllegalArgumentException if {@code value} was negative
		*/
		public static @IntRange(from = 0) int checkArgumentNonnegative(final int value) {
		if (value < 0) {
		throw new IllegalArgumentException();
		}

		return value;
		}

		/**
		* Ensures that that the argument numeric value is non-negative.
		*
		* @param value a numeric long value
		* @return the validated numeric value
		* @throws IllegalArgumentException if {@code value} was negative
		*/
		public static long checkArgumentNonnegative(final long value) {
		if (value < 0) {
		throw new IllegalArgumentException();
		}

		return value;
		}

		/**
		* Ensures that that the argument numeric value is non-negative.
		*
		* @param value a numeric long value
		* @param errorMessage the exception message to use if the check fails
		* @return the validated numeric value
		* @throws IllegalArgumentException if {@code value} was negative
		*/
		public static long checkArgumentNonnegative(final long value, final String errorMessage) {
		if (value < 0) {
		throw new IllegalArgumentException(errorMessage);
		}

		return value;
		}

		/**
		* Ensures that that the argument numeric value is positive.
		*
		* @param value a numeric int value
		* @param errorMessage the exception message to use if the check fails
		* @return the validated numeric value
		* @throws IllegalArgumentException if {@code value} was not positive
		*/
		public static int checkArgumentPositive(final int value, final String errorMessage) {
		if (value <= 0) {
		throw new IllegalArgumentException(errorMessage);
		}

		return value;
		}

		/**
		* Ensures that the argument floating point value is a finite number.
		*
		* <p>A finite number is defined to be both representable (that is, not NaN) and
		* not infinite (that is neither positive or negative infinity).</p>
		*
		* @param value a floating point value
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated floating point value
		*
		* @throws IllegalArgumentException if {@code value} was not finite
		*/
		public static float checkArgumentFinite(final float value, final String valueName) {
		if (Float.isNaN(value)) {
		throw new IllegalArgumentException(valueName + " must not be NaN");
		} else if (Float.isInfinite(value)) {
		throw new IllegalArgumentException(valueName + " must not be infinite");
		}

		return value;
		}

		/**
		* Ensures that the argument floating point value is within the inclusive range.
		*
		* <p>While this can be used to range check against +/- infinity, note that all NaN numbers
		* will always be out of range.</p>
		*
		* @param value a floating point value
		* @param lower the lower endpoint of the inclusive range
		* @param upper the upper endpoint of the inclusive range
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated floating point value
		*
		* @throws IllegalArgumentException if {@code value} was not within the range
		*/
		public static float checkArgumentInRange(float value, float lower, float upper,
		String valueName) {
		if (Float.isNaN(value)) {
		throw new IllegalArgumentException(valueName + " must not be NaN");
		} else if (value < lower) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%f, %f] (too low)", valueName, lower, upper));
		} else if (value > upper) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%f, %f] (too high)", valueName, lower, upper));
		}

		return value;
		}

		/**
		* Ensures that the argument int value is within the inclusive range.
		*
		* @param value a int value
		* @param lower the lower endpoint of the inclusive range
		* @param upper the upper endpoint of the inclusive range
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated int value
		*
		* @throws IllegalArgumentException if {@code value} was not within the range
		*/
		public static int checkArgumentInRange(int value, int lower, int upper,
		String valueName) {
		if (value < lower) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%d, %d] (too low)", valueName, lower, upper));
		} else if (value > upper) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%d, %d] (too high)", valueName, lower, upper));
		}

		return value;
		}

		/**
		* Ensures that the argument long value is within the inclusive range.
		*
		* @param value a long value
		* @param lower the lower endpoint of the inclusive range
		* @param upper the upper endpoint of the inclusive range
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated long value
		*
		* @throws IllegalArgumentException if {@code value} was not within the range
		*/
		public static long checkArgumentInRange(long value, long lower, long upper,
		String valueName) {
		if (value < lower) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%d, %d] (too low)", valueName, lower, upper));
		} else if (value > upper) {
		throw new IllegalArgumentException(
		String.format(
		"%s is out of range of [%d, %d] (too high)", valueName, lower, upper));
		}

		return value;
		}

		/**
		* Ensures that the array is not {@code null}, and none of its elements are {@code null}.
		*
		* @param value an array of boxed objects
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated array
		*
		* @throws NullPointerException if the {@code value} or any of its elements were {@code null}
		*/
		public static <T> T[] checkArrayElementsNotNull(final T[] value, final String valueName) {
		if (value == null) {
		throw new NullPointerException(valueName + " must not be null");
		}

		for (int i = 0; i < value.length; ++i) {
		if (value[i] == null) {
		throw new NullPointerException(
		String.format("%s[%d] must not be null", valueName, i));
		}
		}

		return value;
		}

		/**
		* Ensures that the {@link Collection} is not {@code null}, and none of its elements are
		* {@code null}.
		*
		* @param value a {@link Collection} of boxed objects
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated {@link Collection}
		*
		* @throws NullPointerException if the {@code value} or any of its elements were {@code null}
		*/
		public static @NonNull <C extends Collection<T>, T> C checkCollectionElementsNotNull(
		final C value, final String valueName) {
		if (value == null) {
		throw new NullPointerException(valueName + " must not be null");
		}

		long ctr = 0;
		for (T elem : value) {
		if (elem == null) {
		throw new NullPointerException(
		String.format("%s[%d] must not be null", valueName, ctr));
		}
		++ctr;
		}

		return value;
		}

		/**
		* Ensures that the {@link Collection} is not {@code null}, and contains at least one element.
		*
		* @param value a {@link Collection} of boxed elements.
		* @param valueName the name of the argument to use if the check fails.

		* @return the validated {@link Collection}
		*
		* @throws NullPointerException if the {@code value} was {@code null}
		* @throws IllegalArgumentException if the {@code value} was empty
		*/
		public static <T> Collection<T> checkCollectionNotEmpty(final Collection<T> value,
		final String valueName) {
		if (value == null) {
		throw new NullPointerException(valueName + " must not be null");
		}
		if (value.isEmpty()) {
		throw new IllegalArgumentException(valueName + " is empty");
		}
		return value;
		}

		/**
		* Ensures that all elements in the argument floating point array are within the inclusive range
		*
		* <p>While this can be used to range check against +/- infinity, note that all NaN numbers
		* will always be out of range.</p>
		*
		* @param value a floating point array of values
		* @param lower the lower endpoint of the inclusive range
		* @param upper the upper endpoint of the inclusive range
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated floating point value
		*
		* @throws IllegalArgumentException if any of the elements in {@code value} were out of range
		* @throws NullPointerException if the {@code value} was {@code null}
		*/
		public static float[] checkArrayElementsInRange(float[] value, float lower, float upper,
		String valueName) {
		checkNotNull(value, valueName + " must not be null");

		for (int i = 0; i < value.length; ++i) {
		float v = value[i];

		if (Float.isNaN(v)) {
		throw new IllegalArgumentException(valueName + "[" + i + "] must not be NaN");
		} else if (v < lower) {
		throw new IllegalArgumentException(
		String.format("%s[%d] is out of range of [%f, %f] (too low)",
		valueName, i, lower, upper));
		} else if (v > upper) {
		throw new IllegalArgumentException(
		String.format("%s[%d] is out of range of [%f, %f] (too high)",
		valueName, i, lower, upper));
		}
		}

		return value;
		}

		/**
		* Ensures that all elements in the argument integer array are within the inclusive range
		*
		* @param value an integer array of values
		* @param lower the lower endpoint of the inclusive range
		* @param upper the upper endpoint of the inclusive range
		* @param valueName the name of the argument to use if the check fails
		*
		* @return the validated integer array
		*
		* @throws IllegalArgumentException if any of the elements in {@code value} were out of range
		* @throws NullPointerException if the {@code value} was {@code null}
		*/
		public static int[] checkArrayElementsInRange(int[] value, int lower, int upper,
		String valueName) {
		checkNotNull(value, valueName + " must not be null");

		for (int i = 0; i < value.length; ++i) {
		int v = value[i];

		if (v < lower) {
		throw new IllegalArgumentException(
		String.format("%s[%d] is out of range of [%d, %d] (too low)",
		valueName, i, lower, upper));
		} else if (v > upper) {
		throw new IllegalArgumentException(
		String.format("%s[%d] is out of range of [%d, %d] (too high)",
		valueName, i, lower, upper));
		}
		}

		return value;
		}
		}

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+12 −10

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package com.android.keyguard;

		import static android.app.slice.Slice.HINT_LIST_ITEM;

		import android.animation.LayoutTransition;
		import android.animation.ObjectAnimator;
		import android.animation.PropertyValuesHolder;
		@@ -64,6 +66,7 @@ import androidx.slice.SliceViewManager;
		import androidx.slice.core.SliceQuery;
		import androidx.slice.widget.ListContent;
		import androidx.slice.widget.RowContent;
		import androidx.slice.widget.SliceContent;
		import androidx.slice.widget.SliceLiveData;

		/**
		@@ -159,12 +162,13 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		return;
		}

		ListContent lc = new ListContent(getContext(), mSlice, null, 0, 0);
		mHasHeader = lc.hasHeader();
		List<SliceItem> subItems = new ArrayList<SliceItem>();
		ListContent lc = new ListContent(getContext(), mSlice);
		SliceContent headerContent = lc.getHeader();
		mHasHeader = headerContent != null && !headerContent.getSliceItem().hasHint(HINT_LIST_ITEM);
		List<SliceContent> subItems = new ArrayList<SliceContent>();
		for (int i = 0; i < lc.getRowItems().size(); i++) {
		SliceItem subItem = lc.getRowItems().get(i);
		String itemUri = subItem.getSlice().getUri().toString();
		SliceContent subItem = lc.getRowItems().get(i);
		String itemUri = subItem.getSliceItem().getSlice().getUri().toString();
		// Filter out the action row
		if (!KeyguardSliceProvider.KEYGUARD_ACTION_URI.equals(itemUri)) {
		subItems.add(subItem);
		@@ -175,9 +179,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		} else {
		mTitle.setVisibility(VISIBLE);

		// If there's a header it'll be the first subitem
		RowContent header = new RowContent(getContext(), subItems.get(0),
		true /* showStartItem */);
		RowContent header = lc.getHeader();
		SliceItem mainTitle = header.getTitleItem();
		CharSequence title = mainTitle != null ? mainTitle.getText() : null;
		mTitle.setText(title);
		@@ -189,8 +191,8 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe
		final int startIndex = mHasHeader ? 1 : 0; // First item is header; skip it
		mRow.setVisibility(subItemsCount > 0 ? VISIBLE : GONE);
		for (int i = startIndex; i < subItemsCount; i++) {
		SliceItem item = subItems.get(i);
		RowContent rc = new RowContent(getContext(), item, true /* showStartItem */);
		RowContent rc = (RowContent) subItems.get(i);
		SliceItem item = rc.getSliceItem();
		final Uri itemTag = item.getSlice().getUri();
		// Try to reuse the view if already exists in the layout
		KeyguardSliceButton button = mRow.findViewWithTag(itemTag);