DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master (b455c3a7) · Commits · e / os / android_frameworks_base

Android.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -1687,3 +1687,10 @@ droidstubs {
		},
		},
		}

		filegroup {
		name: "framework-annotation-nonnull-srcs",
		srcs: [
		"core/java/android/annotation/NonNull.java",
		],
		}

config/hiddenapi-greylist-max-o.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -95641,11 +95641,11 @@ Lcom/android/internal/os/KernelCpuProcReader;->ERROR_THRESHOLD:I
		Lcom/android/internal/os/KernelCpuProcReader;->getActiveTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->getClusterTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->getFreqTimeReaderInstance()Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->INITIAL_BUFFER_SIZE:I
		Lcom/android/internal/os/KernelCpuProcReader;->mActiveTimeReader:Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->MAX_BUFFER_SIZE:I
		Lcom/android/internal/os/KernelCpuProcReader;->mBuffer:[B
		Lcom/android/internal/os/KernelCpuProcReader;->mBuffer:Ljava/nio/ByteBuffer;
		Lcom/android/internal/os/KernelCpuProcReader;->mClusterTimeReader:Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->mContentSize:I
		Lcom/android/internal/os/KernelCpuProcReader;->mErrors:I
		Lcom/android/internal/os/KernelCpuProcReader;->mFreqTimeReader:Lcom/android/internal/os/KernelCpuProcReader;
		Lcom/android/internal/os/KernelCpuProcReader;->mLastReadTime:J
		@@ -95655,6 +95655,7 @@ Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_ACTIVE_TIME:Ljava/lang/S
		Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_CLUSTER_TIME:Ljava/lang/String;
		Lcom/android/internal/os/KernelCpuProcReader;->PROC_UID_FREQ_TIME:Ljava/lang/String;
		Lcom/android/internal/os/KernelCpuProcReader;->readBytes()Ljava/nio/ByteBuffer;
		Lcom/android/internal/os/KernelCpuProcReader;->resize()Z
		Lcom/android/internal/os/KernelCpuProcReader;->setThrottleInterval(J)V
		Lcom/android/internal/os/KernelCpuProcReader;->TAG:Ljava/lang/String;
		Lcom/android/internal/os/KernelCpuSpeedReader;

core/java/android/app/Activity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2185,7 +2185,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) {