Snap for 5450365 from 2a21bea448c56d892cf7c726771889ff2299f4d5 to pi-platform-release (210c37f1) · Commits · e / os / android_frameworks_base

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2154,7 +2154,7 @@ public class Activity extends ContextThemeWrapper
		* picture-in-picture.
		*
		* @return true if the system successfully put this activity into picture-in-picture mode or was
		* already in picture-in-picture mode (@see {@link #isInPictureInPictureMode()). If the device
		* already in picture-in-picture mode (see {@link #isInPictureInPictureMode()}). If the device
		* does not support picture-in-picture, return false.
		*/
		public boolean enterPictureInPictureMode(@NonNull PictureInPictureParams params) {

core/java/android/app/RemoteInput.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,7 +149,7 @@ public final class RemoteInput implements Parcelable {

		/**
		* Returns true if the input only accepts data, meaning {@link #getAllowFreeFormInput}
		* is false, {@link #getChoices} is null or empty, and {@link #getAllowedDataTypes is
		* is false, {@link #getChoices} is null or empty, and {@link #getAllowedDataTypes} is
		* non-null and not empty.
		*/
		public boolean isDataOnly() {

core/java/android/app/slice/Slice.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ public final class Slice implements Parcelable {
		/**
		* Add a sub-slice to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addSubSlice(@NonNull Slice slice, @Nullable @SliceSubtype String subType) {
		Preconditions.checkNotNull(slice);
		@@ -437,7 +437,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an action to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addAction(@NonNull PendingIntent action, @NonNull Slice s,
		@Nullable @SliceSubtype String subType) {
		@@ -453,7 +453,7 @@ public final class Slice implements Parcelable {
		/**
		* Add text to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addText(CharSequence text, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -464,7 +464,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an image to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addIcon(Icon icon, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -476,7 +476,7 @@ public final class Slice implements Parcelable {
		/**
		* Add remote input to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addRemoteInput(RemoteInput remoteInput,
		@Nullable @SliceSubtype String subType,
		@@ -490,7 +490,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an integer to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addInt(int value, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -511,7 +511,7 @@ public final class Slice implements Parcelable {
		/**
		* Add a long to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addLong(long value, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -525,7 +525,7 @@ public final class Slice implements Parcelable {
		* <p>Expected to be used for support library extension, should not be used for general
		* development
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addBundle(Bundle bundle, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {

core/java/android/app/slice/SliceProvider.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -209,7 +209,7 @@ public abstract class SliceProvider extends ContentProvider {
		*
		* @param sliceUri Uri to bind.
		* @param supportedSpecs List of supported specs.
		* @see {@link Slice}.
		* @see {@link Slice}
		* @see {@link Slice#HINT_PARTIAL}
		*/
		public Slice onBindSlice(Uri sliceUri, Set<SliceSpec> supportedSpecs) {

core/java/android/content/ContentProvider.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1062,12 +1062,12 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
		* Implement this to handle query requests where the arguments are packed into a {@link Bundle}.
		* Arguments may include traditional SQL style query arguments. When present these
		* should be handled according to the contract established in
		* {@link #query(Uri, String[], String, String[], String, CancellationSignal).
		* {@link #query(Uri, String[], String, String[], String, CancellationSignal)}.
		*
		* <p>Traditional SQL arguments can be found in the bundle using the following keys:
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION}
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS}
		* <li>{@link ContentResolver#QUERY_ARG_SQL_SORT_ORDER}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SELECTION_ARGS}
		* <li>{@link android.content.ContentResolver#QUERY_ARG_SQL_SORT_ORDER}
		*
		* <p>This method can be called from multiple threads, as described in
		* <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
		@@ -1124,8 +1124,8 @@ public abstract class ContentProvider implements ComponentCallbacks2 {

		return cursor;</pre>
		* <p>
		* @see #query(Uri, String[], String, String[], String, CancellationSignal) for
		* implementation details.
		* See {@link #query(Uri, String[], String, String[], String, CancellationSignal)}
		* for implementation details.
		*
		* @param uri The URI to query. This will be the full URI sent by the client.
		* @param projection The list of columns to put into the cursor.