commit 85de0791e4697c256c4c055515504d1d3b3d4906
author Jack Yu <jackyu@google.com> Thu Oct 10 23:57:01 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 10 23:57:01 2019 +0000
tree 5c652a2f4223398fc682b00f5e67180349fa1028
parent 685d950fdfb3c7a270e47fe03c5dc68607f2ce5c
parent 6475b2182a8c82e14e6bfc8284c8aae1457b9e1a

Merge "Fix inconsistentcy API in CellInfoNr"

telephony/java/android/telephony/CellInfoNr.java

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