commit 47d397e28e08346b8b6a237790b88d676aefbb4f
author Jack Yu <jackyu@google.com> Thu Oct 10 17:26:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Oct 10 17:26:14 2019 -0700
tree 5c1a6cf7c415457c4784cae8c37aa2069aeffb3b
parent 1a14e840b9b822a06134e66586d7288e79a5fad9
parent a2edbe577c61b61e8e515f8df69fc4526fe91315

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

Change-Id: I48da0dd235696eb93affdc232284ef3432e84f96

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() {