Merge "docs: Fixing malformed @links" into pi-dev (b2ad787a) · Commits · e / os / android_frameworks_base

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/os/UserManager.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -1445,11 +1445,11 @@ public class UserManager {
		* background user; the result here does not distinguish between the two.
		*
		* <p>Note prior to Android Nougat MR1 (SDK version <= 24;
		* {@link android.os.Build.VERSION_CODES#N), this API required a system permission
		* {@link android.os.Build.VERSION_CODES#N}, this API required a system permission
		* in order to check other profile's status.
		* Since Android Nougat MR1 (SDK version >= 25;
		* {@link android.os.Build.VERSION_CODES#N_MR1)), the restriction has been relaxed, and now
		* it'll accept any {@link UserHandle} within the same profile group as the caller.
		* {@link android.os.Build.VERSION_CODES#N_MR1}), the restriction has been relaxed, and now
		* it'll accept any {@link android.os.UserHandle} within the same profile group as the caller.
		*
		* @param user The user to retrieve the running state for.
		*/
		@@ -1474,11 +1474,11 @@ public class UserManager {
		* (but is not yet fully stopped, and still running some code).
		*
		* <p>Note prior to Android Nougat MR1 (SDK version <= 24;
		* {@link android.os.Build.VERSION_CODES#N), this API required a system permission
		* {@link android.os.Build.VERSION_CODES#N}, this API required a system permission
		* in order to check other profile's status.
		* Since Android Nougat MR1 (SDK version >= 25;
		* {@link android.os.Build.VERSION_CODES#N_MR1)), the restriction has been relaxed, and now
		* it'll accept any {@link UserHandle} within the same profile group as the caller.
		* {@link android.os.Build.VERSION_CODES#N_MR1}), the restriction has been relaxed, and now
		* it'll accept any {@link android.os.UserHandle} within the same profile group as the caller.
		*
		* @param user The user to retrieve the running state for.
		*/