Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6475b218 authored by Pengquan Meng's avatar Pengquan Meng
Browse files

Fix inconsistentcy API in CellInfoNr 

Add the annotation CovariantReturnType to
CellInroNr#getCellSignalStrength() and CellInfo#getCellIdentity() to
modify the return class to a NR specific class.

bug: 136514894
Test: atest CellInfoTest
Change-Id: If87b6bf13a84c60632a526ad9c49ca0ca77b5f8f
parent 763cb463

telephony/java/android/telephony/CellInfoNr.java

+4 −0
Original line number Diff line number Diff line
@@ -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() {