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

Commit fa7d53cc authored by Amy Zhang's avatar Amy Zhang
Browse files

Deprecate int getFecCapability() and add long getCodeRateCapability() 

instead

Test: make
Bug: 155436396
Change-Id: I9726d865c4f1e47af63c4b106eace548a9a94ed0
parent 6e59ac63

api/system-current.txt

+2 −1
Original line number Diff line number Diff line
@@ -5790,7 +5790,8 @@ package android.media.tv.tuner.frontend { 














  public class DvbcFrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {















    method public int getAnnexCapability();













    method public int getFecCapability();













    method public long getCodeRateCapability();













    method @Deprecated public int getFecCapability();















    method public int getModulationCapability();















  }















































core/api/system-current.txt



+2
−1




























Original line number
Diff line number
Diff line








@@ -5730,7 +5730,8 @@ package android.media.tv.tuner.frontend {



























  public class DvbcFrontendCapabilities extends android.media.tv.tuner.frontend.FrontendCapabilities {















    method public int getAnnexCapability();













    method public int getFecCapability();













    method public long getCodeRateCapability();













    method @Deprecated public int getFecCapability();















    method public int getModulationCapability();















  }















































media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java



+17
−2




























Original line number
Diff line number
Diff line








@@ -26,10 +26,10 @@ import android.annotation.SystemApi;













@SystemApi















public class DvbcFrontendCapabilities extends FrontendCapabilities {















    private final int mModulationCap;













    private final int mFecCap;













    private final long mFecCap;















    private final int mAnnexCap;





























    private DvbcFrontendCapabilities(int modulationCap, int fecCap, int annexCap) {













    private DvbcFrontendCapabilities(int modulationCap, long fecCap, int annexCap) {















        mModulationCap = modulationCap;















        mFecCap = fecCap;















        mAnnexCap = annexCap;









@@ -44,9 +44,24 @@ public class DvbcFrontendCapabilities extends FrontendCapabilities {













    }















    /**















     * Gets inner FEC capability.













     *













     * @deprecated Use {@link getInnerFecCapability()} with long return value instead. This function













     *             returns the correct cap value when the value is not bigger than the max integer













     *             value. Otherwise it returns {@link FrontendSettings#FEC_UNDEFINED}.















     */













    @Deprecated















    @FrontendSettings.InnerFec















    public int getFecCapability() {













        if (mFecCap > Integer.MAX_VALUE) {













            return (int) FrontendSettings.FEC_UNDEFINED;













        }













        return (int) mFecCap;













    }













    /**













     * Gets code rate capability.













     */













    @FrontendSettings.InnerFec













    public long getCodeRateCapability() {















        return mFecCap;















    }















    /**

































media/jni/android_media_tv_Tuner.cpp



+2
−2




























Original line number
Diff line number
Diff line








@@ -1226,10 +1226,10 @@ jobject JTuner::getAtscFrontendCaps(JNIEnv *env, FrontendInfo::FrontendCapabilit





























jobject JTuner::getDvbcFrontendCaps(JNIEnv *env, FrontendInfo::FrontendCapabilities& caps) {















    jclass clazz = env->FindClass("android/media/tv/tuner/frontend/DvbcFrontendCapabilities");













    jmethodID capsInit = env->GetMethodID(clazz, "<init>", "(III)V");













    jmethodID capsInit = env->GetMethodID(clazz, "<init>", "(IJI)V");































    jint modulationCap = caps.dvbcCaps().modulationCap;













    jint fecCap = caps.dvbcCaps().fecCap;













    jlong fecCap = caps.dvbcCaps().fecCap;















    jint annexCap = caps.dvbcCaps().annexCap;































    return env->NewObject(clazz, capsInit, modulationCap, fecCap, annexCap);