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

Commit e05f762b authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fix inconsistentcy API in CellInfoNr" am: 85de0791 am: a2edbe57

am: 47d397e2

Change-Id: Iaf13c8d20939fbc66a8a9210212c38e092e80bd6
parents b29eb6ab 47d397e2
Loading
Loading
Loading
Loading
+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() {