From e6da154c51ac92ead918e0be582a634e60c8abad Mon Sep 17 00:00:00 2001 From: Caitlin Cassidy Date: Wed, 23 Feb 2022 19:46:01 +0000 Subject: [PATCH] [Nearby Devices] Minor updates to API based on API review. Fixes: 220153391 Test: compiles Change-Id: I0bb50f04af041f79413e8f1fbc4be78901e5dd88 --- core/api/system-current.txt | 1 - media/java/android/media/NearbyDevice.java | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 83464f0ca1df5..a6305bb3e9237 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -6325,7 +6325,6 @@ package android.media { method public int describeContents(); method @NonNull public String getMediaRoute2Id(); method public int getRangeZone(); - method @NonNull public static String rangeZoneToString(int); method public void writeToParcel(@NonNull android.os.Parcel, int); field @NonNull public static final android.os.Parcelable.Creator CREATOR; field public static final int RANGE_CLOSE = 3; // 0x3 diff --git a/media/java/android/media/NearbyDevice.java b/media/java/android/media/NearbyDevice.java index cb85109be6d1e..c203e7b2b88ba 100644 --- a/media/java/android/media/NearbyDevice.java +++ b/media/java/android/media/NearbyDevice.java @@ -81,6 +81,8 @@ public final class NearbyDevice implements Parcelable { /** * Gets a human-readable string of the range zone. + * + * @hide */ @NonNull public static String rangeZoneToString(@RangeZone int rangeZone) { @@ -103,13 +105,14 @@ public final class NearbyDevice implements Parcelable { @NonNull private final String mMediaRoute2Id; @RangeZone private final int mRangeZone; - public NearbyDevice(@NonNull String mediaRoute2Id, int rangeZone) { + /** Creates a device object with the given ID and range zone. */ + public NearbyDevice(@NonNull String mediaRoute2Id, @RangeZone int rangeZone) { mMediaRoute2Id = mediaRoute2Id; mRangeZone = rangeZone; } private NearbyDevice(@NonNull Parcel in) { - mMediaRoute2Id = in.readString(); + mMediaRoute2Id = in.readString8(); mRangeZone = in.readInt(); }