diff --git a/api/test-current.txt b/api/test-current.txt index b08ae0e037d32..718c0f21a1eb1 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -130,6 +130,12 @@ package android.app { method public android.content.ComponentName getEffectsSuppressor(); } + public final class PictureInPictureParams implements android.os.Parcelable { + method public java.util.List getActions(); + method public float getAspectRatio(); + method public android.graphics.Rect getSourceRectHint(); + } + public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener { method public android.widget.TimePicker getTimePicker(); } diff --git a/config/hiddenapi-light-greylist.txt b/config/hiddenapi-light-greylist.txt index 0941d396ed808..f805dea6343c8 100644 --- a/config/hiddenapi-light-greylist.txt +++ b/config/hiddenapi-light-greylist.txt @@ -857,9 +857,6 @@ Landroid/app/PendingIntent;->setOnMarshaledListener(Landroid/app/PendingIntent$O Landroid/app/PictureInPictureArgs;->()V Landroid/app/PictureInPictureArgs;->setActions(Ljava/util/List;)V Landroid/app/PictureInPictureArgs;->setAspectRatio(F)V -Landroid/app/PictureInPictureParams;->getActions()Ljava/util/List; -Landroid/app/PictureInPictureParams;->getAspectRatio()F -Landroid/app/PictureInPictureParams;->getSourceRectHint()Landroid/graphics/Rect; Landroid/app/Presentation;->createPresentationContext(Landroid/content/Context;Landroid/view/Display;I)Landroid/content/Context; Landroid/app/ProgressDialog;->mMessageView:Landroid/widget/TextView; Landroid/app/ProgressDialog;->mProgress:Landroid/widget/ProgressBar; diff --git a/core/java/android/app/PictureInPictureParams.java b/core/java/android/app/PictureInPictureParams.java index 7313b0d941e5a..edaae75eba534 100644 --- a/core/java/android/app/PictureInPictureParams.java +++ b/core/java/android/app/PictureInPictureParams.java @@ -17,6 +17,7 @@ package android.app; import android.annotation.Nullable; +import android.annotation.TestApi; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; @@ -181,6 +182,7 @@ public final class PictureInPictureParams implements Parcelable { * @return the aspect ratio. If none is set, return 0. * @hide */ + @TestApi public float getAspectRatio() { if (mAspectRatio != null) { return mAspectRatio.floatValue(); @@ -205,6 +207,7 @@ public final class PictureInPictureParams implements Parcelable { * @return the set of user actions. * @hide */ + @TestApi public List getActions() { return mUserActions; } @@ -231,6 +234,7 @@ public final class PictureInPictureParams implements Parcelable { * @return the source rect hint * @hide */ + @TestApi public Rect getSourceRectHint() { return mSourceRectHint; }