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

Merge "[Nearby Devices] Minor updates to API based on API review." into tm-dev am: fe57067427

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16988389

Change-Id: I77eba796250f451082df99d61dde34815102fe80
This commit is contained in:
Caitlin Cassidy
2022-03-02 16:25:08 +00:00
committed by Automerger Merge Worker
parent 10e644bd24 fe57067427
commit eb47ff6e77
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/system-current.txt
View File

@@ -6329,7 +6329,6 @@ package android.media {
method public int describeContents(); method public int describeContents();
method @NonNull public String getMediaRoute2Id(); method @NonNull public String getMediaRoute2Id();
method public int getRangeZone(); method public int getRangeZone();
method @NonNull public static String rangeZoneToString(int);
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.media.NearbyDevice> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.media.NearbyDevice> CREATOR;
field public static final int RANGE_CLOSE = 3; // 0x3 field public static final int RANGE_CLOSE = 3; // 0x3

7
media/java/android/media/NearbyDevice.java
View File

@@ -81,6 +81,8 @@ public final class NearbyDevice implements Parcelable {
/** /**
* Gets a human-readable string of the range zone. * Gets a human-readable string of the range zone.
*
* @hide
*/ */
@NonNull @NonNull
public static String rangeZoneToString(@RangeZone int rangeZone) { public static String rangeZoneToString(@RangeZone int rangeZone) {
@@ -103,13 +105,14 @@ public final class NearbyDevice implements Parcelable {
@NonNull private final String mMediaRoute2Id; @NonNull private final String mMediaRoute2Id;
@RangeZone private final int mRangeZone; @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; mMediaRoute2Id = mediaRoute2Id;
mRangeZone = rangeZone; mRangeZone = rangeZone;
} }
private NearbyDevice(@NonNull Parcel in) { private NearbyDevice(@NonNull Parcel in) {
mMediaRoute2Id = in.readString(); mMediaRoute2Id = in.readString8();
mRangeZone = in.readInt(); mRangeZone = in.readInt();
} }