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

Merge "Fix inconsistentcy API in CellInfoNr"

Browse Source 
am: 85de0791e4

Change-Id: If59a8a3dd376bb63740c8272e8b3056bb75b8e4c
This commit is contained in:
Jack Yu
2019-10-10 17:14:15 -07:00
committed by android-build-merger
parent 77e9723b71 85de0791e4
commit a2edbe577c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/CellInfoNr.java
View File

@@ -19,6 +19,8 @@ package android.telephony;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.os.Parcel; import android.os.Parcel;
import dalvik.annotation.codegen.CovariantReturnType;
import java.util.Objects; import java.util.Objects;
/** /**
@@ -46,6 +48,7 @@ public final class CellInfoNr extends CellInfo {
/** /**
* @return a {@link CellIdentityNr} instance. * @return a {@link CellIdentityNr} instance.
*/ */
@CovariantReturnType(returnType = CellIdentityNr.class, presentAfter = 29)
@Override @Override
@NonNull @NonNull
public CellIdentity getCellIdentity() { public CellIdentity getCellIdentity() {
@@ -55,6 +58,7 @@ public final class CellInfoNr extends CellInfo {
/** /**
* @return a {@link CellSignalStrengthNr} instance. * @return a {@link CellSignalStrengthNr} instance.
*/ */
@CovariantReturnType(returnType = CellSignalStrengthNr.class, presentAfter = 29)
@Override @Override
@NonNull @NonNull
public CellSignalStrength getCellSignalStrength() { public CellSignalStrength getCellSignalStrength() {