Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791e4 am: a2edbe577c

am: 47d397e28e

Change-Id: Iaf13c8d20939fbc66a8a9210212c38e092e80bd6

telephony/java/android/telephony/CellInfoNr.java

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