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

Commit 85de0791 authored by Jack Yu's avatar Jack Yu Committed by Gerrit Code Review
Browse files

Merge "Fix inconsistentcy API in CellInfoNr"

parents 685d950f 6475b218

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