Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "docs: Fixing malformed @links" into pi-dev

Browse Source
This commit is contained in:
Andrew Solovay
2018-12-13 16:58:29 +00:00
committed by Android (Google) Code Review
parent 9f38c5b856 8a788f4094
commit 39f74d5732
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/Activity.java
View File

@@ -2154,7 +2154,7 @@ public class Activity extends ContextThemeWrapper
* picture-in-picture. * picture-in-picture.
* *
* @return true if the system successfully put this activity into picture-in-picture mode or was * @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. * does not support picture-in-picture, return false.
*/ */
public boolean enterPictureInPictureMode(@NonNull PictureInPictureParams params) { public boolean enterPictureInPictureMode(@NonNull PictureInPictureParams params) {

2
core/java/android/app/RemoteInput.java
View File

@@ -149,7 +149,7 @@ public final class RemoteInput implements Parcelable {
/** /**
* Returns true if the input only accepts data, meaning {@link #getAllowFreeFormInput} * 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. * non-null and not empty.
*/ */
public boolean isDataOnly() { public boolean isDataOnly() {

12
core/java/android/os/UserManager.java
View File

@@ -1445,11 +1445,11 @@ public class UserManager {
* background user; the result here does not distinguish between the two. * background user; the result here does not distinguish between the two.
* *
* <p>Note prior to Android Nougat MR1 (SDK version <= 24; * <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. * in order to check other profile's status.
* Since Android Nougat MR1 (SDK version >= 25; * Since Android Nougat MR1 (SDK version >= 25;
* {@link android.os.Build.VERSION_CODES#N_MR1)), the restriction has been relaxed, and now * {@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. * 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. * @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). * (but is not yet fully stopped, and still running some code).
* *
* <p>Note prior to Android Nougat MR1 (SDK version <= 24; * <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. * in order to check other profile's status.
* Since Android Nougat MR1 (SDK version >= 25; * Since Android Nougat MR1 (SDK version >= 25;
* {@link android.os.Build.VERSION_CODES#N_MR1)), the restriction has been relaxed, and now * {@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. * 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. * @param user The user to retrieve the running state for.
*/ */