diff options
20 files changed, 84 insertions, 93 deletions
diff --git a/media/java/android/media/tv/tuner/Descrambler.java b/media/java/android/media/tv/tuner/Descrambler.java index 700e7beb06c6..b64ba887e9cd 100644 --- a/media/java/android/media/tv/tuner/Descrambler.java +++ b/media/java/android/media/tv/tuner/Descrambler.java @@ -117,9 +117,9 @@ public class Descrambler implements AutoCloseable { * <p>A descrambler instance can have only one key slot to link, but a key slot can hold a few * keys for different purposes. {@link Tuner.VOID_KEYTOKEN} is considered valid. * - * @param keyToken the token to be used to link the key slot. Use {@link Tuner.VOID_KEYTOKEN} + * @param keyToken the token to be used to link the key slot. Use {@link Tuner#VOID_KEYTOKEN} * to remove the current key from descrambler. If the current keyToken comes from a - * MediaCas session, use {@link Tuner.VOID_KEYTOKEN} to remove current key before + * MediaCas session, use {@link Tuner#VOID_KEYTOKEN} to remove current key before * closing the MediaCas session. * @return result status of the operation. */ diff --git a/media/java/android/media/tv/tuner/Tuner.java b/media/java/android/media/tv/tuner/Tuner.java index 12700efd3d23..dec0709c97d8 100644 --- a/media/java/android/media/tv/tuner/Tuner.java +++ b/media/java/android/media/tv/tuner/Tuner.java @@ -685,7 +685,7 @@ public class Tuner implements AutoCloseable { * * <p>Tuner resource manager (TRM) uses the client priority value to decide whether it is able * to get frontend resource. If the client can't get the resource, this call returns {@link - * Result#RESULT_UNAVAILABLE}. + * #RESULT_UNAVAILABLE}. * * <p> * This locks the frontend to a frequency by providing signal @@ -699,7 +699,7 @@ public class Tuner implements AutoCloseable { * * <p>Tuning with {@link android.media.tv.tuner.frontend.DtmbFrontendSettings} is only * supported in Tuner 1.1 or higher version. Unsupported version will cause no-op. Use {@link - * TunerVersionChecker.getTunerVersion()} to get the version information. + * TunerVersionChecker#getTunerVersion()} to get the version information. * * @param settings Signal delivery information the frontend uses to * search and lock the signal. @@ -748,7 +748,7 @@ public class Tuner implements AutoCloseable { * * <p>Scanning with {@link android.media.tv.tuner.frontend.DtmbFrontendSettings} is only * supported in Tuner 1.1 or higher version. Unsupported version will cause no-op. Use {@link - * TunerVersionChecker.getTunerVersion()} to get the version information. + * TunerVersionChecker#getTunerVersion()} to get the version information. * * @param settings A {@link FrontendSettings} to configure the frontend. * @param scanType The scan type. @@ -854,7 +854,7 @@ public class Tuner implements AutoCloseable { * <p>This retrieve the statuses of the frontend for given status types. * * @param statusTypes an array of status types which the caller requests. Any types that are not - * in {@link FrontendInfo.getStatusCapabilities()} would be ignored. + * in {@link FrontendInfo#getStatusCapabilities()} would be ignored. * @return statuses which response the caller's requests. {@code null} if the operation failed. */ @Nullable @@ -903,7 +903,7 @@ public class Tuner implements AutoCloseable { * use the output from CI-CAM as the input after this call. * * <p> Note that this API is used to connect the CI-CAM to the Demux module while - * {@link connectFrontendToCiCam(int)} is used to connect CI-CAM to the Frontend module. + * {@link #connectFrontendToCiCam(int)} is used to connect CI-CAM to the Frontend module. * * @param ciCamId specify CI-CAM Id to connect. * @return result status of the operation. @@ -925,20 +925,20 @@ public class Tuner implements AutoCloseable { * the TS directly from the frontend. * * <p> Note that this API is used to connect the CI-CAM to the Frontend module while - * {@link connectCiCam(int)} is used to connect CI-CAM to the Demux module. + * {@link #connectCiCam(int)} is used to connect CI-CAM to the Demux module. * * <p>Use {@link #disconnectFrontendToCiCam(int)} to disconnect. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op and return {@link INVALID_LTS_ID}. Use {@link TunerVersionChecker.getTunerVersion()} to - * check the version. + * no-op and return {@link #INVALID_LTS_ID}. Use {@link TunerVersionChecker#getTunerVersion()} + * to check the version. * * @param ciCamId specify CI-CAM Id, which is the id of the Conditional Access Modules (CAM) * Common Interface (CI), to link. * @return Local transport stream id when connection is successfully established. Failed - * operation returns {@link INVALID_LTS_ID} while unsupported version also returns - * {@link INVALID_LTS_ID}. Check the current HAL version using - * {@link TunerVersionChecker.getTunerVersion()}. + * operation returns {@link #INVALID_LTS_ID} while unsupported version also returns + * {@link #INVALID_LTS_ID}. Check the current HAL version using + * {@link TunerVersionChecker#getTunerVersion()}. */ public int connectFrontendToCiCam(int ciCamId) { if (TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1, @@ -956,7 +956,7 @@ public class Tuner implements AutoCloseable { * <p>The demux will use the output from the frontend as the input after this call. * * <p> Note that this API is used to disconnect the CI-CAM to the Demux module while - * {@link disconnectFrontendToCiCam(int)} is used to disconnect CI-CAM to the Frontend module. + * {@link #disconnectFrontendToCiCam(int)} is used to disconnect CI-CAM to the Frontend module. * * @return result status of the operation. */ @@ -974,15 +974,15 @@ public class Tuner implements AutoCloseable { * <p>It is used by the client to unlink CI-CAM to a Frontend. * * <p> Note that this API is used to disconnect the CI-CAM to the Demux module while - * {@link disconnectCiCam(int)} is used to disconnect CI-CAM to the Frontend module. + * {@link #disconnectCiCam(int)} is used to disconnect CI-CAM to the Frontend module. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param ciCamId specify CI-CAM Id, which is the id of the Conditional Access Modules (CAM) * Common Interface (CI), to disconnect. * @return result status of the operation. Unsupported version would return - * {@link RESULT_UNAVAILABLE} + * {@link #RESULT_UNAVAILABLE} */ @Result public int disconnectFrontendToCiCam(int ciCamId) { @@ -1291,7 +1291,7 @@ public class Tuner implements AutoCloseable { /** * Opens a Descrambler in tuner. * - * @return a {@link Descrambler} object. + * @return a {@link Descrambler} object. */ @RequiresPermission(android.Manifest.permission.ACCESS_TV_DESCRAMBLER) @Nullable diff --git a/media/java/android/media/tv/tuner/filter/AvSettings.java b/media/java/android/media/tv/tuner/filter/AvSettings.java index e482875c38d3..25457a7bd437 100644 --- a/media/java/android/media/tv/tuner/filter/AvSettings.java +++ b/media/java/android/media/tv/tuner/filter/AvSettings.java @@ -251,9 +251,9 @@ public class AvSettings extends Settings { * Sets the Audio Stream Type. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * - * @param audioStreamType the {@link AudioStreamType} to set. + * @param audioStreamType the audio stream type to set. */ @NonNull public Builder setAudioStreamType(@AudioStreamType int audioStreamType) { @@ -269,9 +269,9 @@ public class AvSettings extends Settings { * Sets the Video Stream Type. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * - * @param videoStreamType the {@link VideoStreamType} to set. + * @param videoStreamType the video stream type to set. */ @NonNull public Builder setVideoStreamType(@VideoStreamType int videoStreamType) { diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java index 451f54caf7f9..96371e505a77 100644 --- a/media/java/android/media/tv/tuner/filter/Filter.java +++ b/media/java/android/media/tv/tuner/filter/Filter.java @@ -323,25 +323,25 @@ public class Filter implements AutoCloseable { } /** - * Configure the Filter to monitor scrambling status and ip cid change. Set corresponding bit of - * {@link MonitorEventTypeMask} to monitor the change. Reset to stop monitoring. + * Configure the Filter to monitor scrambling status and ip cid change. Set corresponding bit + * to monitor the change. Reset to stop monitoring. * * <p>{@link ScramblingStatusEvent} should be sent at the following two scenarios: * <ul> - * <li>When this method is called with {@link MONITOR_EVENT_SCRAMBLING_STATUS}, the first + * <li>When this method is called with {@link #MONITOR_EVENT_SCRAMBLING_STATUS}, the first * detected scrambling status should be sent. * <li>When the Scrambling status transits into different status, event should be sent. * <ul/> * * <p>{@link IpCidChangeEvent} should be sent at the following two scenarios: * <ul> - * <li>When this method is called with {@link MONITOR_EVENT_IP_CID_CHANGE}, the first detected - * CID for the IP should be sent. + * <li>When this method is called with {@link #MONITOR_EVENT_IP_CID_CHANGE}, the first + * detected CID for the IP should be sent. * <li>When the CID is changed to different value for the IP filter, event should be sent. * <ul/> * * <p>This configuration is only supported in Tuner 1.1 or higher version. Unsupported version - * will cause no-op. Use {@link TunerVersionChecker.getTunerVersion()} to get the version + * will cause no-op. Use {@link TunerVersionChecker#getTunerVersion()} to get the version * information. * * @param monitorEventTypesMask Types of event to be monitored. Set corresponding bit to diff --git a/media/java/android/media/tv/tuner/filter/IpCidChangeEvent.java b/media/java/android/media/tv/tuner/filter/IpCidChangeEvent.java index c0043f3b15cd..2894c02601a2 100644 --- a/media/java/android/media/tv/tuner/filter/IpCidChangeEvent.java +++ b/media/java/android/media/tv/tuner/filter/IpCidChangeEvent.java @@ -22,7 +22,7 @@ import android.annotation.SystemApi; * Ip Cid Change event sent from {@link Filter} objects new ip cid. * * <p>This event is only sent in Tuner 1.1 or higher version. Use - * {@link TunerVersionChecker.getTunerVersion()} to get the version information. + * {@link TunerVersionChecker#getTunerVersion()} to get the version information. * * @hide */ @@ -38,7 +38,7 @@ public final class IpCidChangeEvent extends FilterEvent { * Gets ip cid. * * <p>This event is only sent in Tuner 1.1 or higher version. Use - * {@link TunerVersionChecker.getTunerVersion()} to get the version information. + * {@link TunerVersionChecker#getTunerVersion()} to get the version information. */ public int getIpCid() { return mCid; diff --git a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java index 62d55f54cb26..4b69807e5078 100644 --- a/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java +++ b/media/java/android/media/tv/tuner/filter/IpFilterConfiguration.java @@ -100,7 +100,7 @@ public final class IpFilterConfiguration extends FilterConfiguration { * Gets the ip filter context id. Default value is {@link #INVALID_IP_FILTER_CONTEXT_ID}. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would return - * default value. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * default value. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @IntRange(from = 0, to = 0xefff) public int getIpFilterContextId() { @@ -194,7 +194,7 @@ public final class IpFilterConfiguration extends FilterConfiguration { * Sets the ip filter context id. Default value is {@link #INVALID_IP_FILTER_CONTEXT_ID}. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull public Builder setIpFilterContextId(int ipContextId) { diff --git a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java index 1bbd6e36c104..6a41c74ef73a 100644 --- a/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java +++ b/media/java/android/media/tv/tuner/filter/MmtpRecordEvent.java @@ -65,8 +65,8 @@ public class MmtpRecordEvent extends FilterEvent { * Get the MPU sequence number of the filtered data. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link android.media.tv.tuner.Tuner.INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version + * return {@link android.media.tv.tuner.Tuner#INVALID_MMTP_RECORD_EVENT_MPT_SEQUENCE_NUM}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ public int getMpuSequenceNumber() { @@ -78,8 +78,8 @@ public class MmtpRecordEvent extends FilterEvent { * and has the same format as the PTS in ISO/IEC 13818-1. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link android.media.tv.tuner.Tuner.INVALID_TIMESTAMP}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version + * return {@link android.media.tv.tuner.Tuner#INVALID_TIMESTAMP}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ public long getPts() { @@ -90,8 +90,8 @@ public class MmtpRecordEvent extends FilterEvent { * Get the address of the first macroblock in the slice defined in ITU-T Rec. H.264. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link android.media.tv.tuner.Tuner.INVALID_FIRST_MACROBLOCK_IN_SLICE}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version + * return {@link android.media.tv.tuner.Tuner#INVALID_FIRST_MACROBLOCK_IN_SLICE}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ public int getFirstMacroblockInSlice() { @@ -102,8 +102,8 @@ public class MmtpRecordEvent extends FilterEvent { * Get the offset of the recorded keyframe from MMT Packet Table. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link RecordSettings.TS_INDEX_INVALID}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the + * return {@link RecordSettings#TS_INDEX_INVALID}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the * version information. */ @RecordSettings.TsIndexMask diff --git a/media/java/android/media/tv/tuner/filter/RestartEvent.java b/media/java/android/media/tv/tuner/filter/RestartEvent.java index 45ab7d9da4cc..069630188e55 100644 --- a/media/java/android/media/tv/tuner/filter/RestartEvent.java +++ b/media/java/android/media/tv/tuner/filter/RestartEvent.java @@ -22,7 +22,7 @@ import android.annotation.SystemApi; * An Event that the client would reveice after stopping, reconfiguring and restarting a filter. * * <p>After stopping and restarting the filter, the client has to discard all coming events until - * it receive {@link RestartedEvent} to avoid using the events from the previous configuration. + * it receives {@link RestartEvent} to avoid using the events from the previous configuration. * * <p>Recofiguring must happen after stopping the filter. * diff --git a/media/java/android/media/tv/tuner/filter/ScramblingStatusEvent.java b/media/java/android/media/tv/tuner/filter/ScramblingStatusEvent.java index fef539638db8..103d024bf9f2 100644 --- a/media/java/android/media/tv/tuner/filter/ScramblingStatusEvent.java +++ b/media/java/android/media/tv/tuner/filter/ScramblingStatusEvent.java @@ -22,7 +22,7 @@ import android.annotation.SystemApi; * Scrambling Status event sent from {@link Filter} objects with Scrambling Status type. * * <p>This event is only sent in Tuner 1.1 or higher version. Use - * {@link TunerVersionChecker.getTunerVersion()} to get the version information. + * {@link TunerVersionChecker#getTunerVersion()} to get the version information. * * @hide */ @@ -38,7 +38,7 @@ public final class ScramblingStatusEvent extends FilterEvent { * Gets Scrambling Status Type. * * <p>This event field is only sent in Tuner 1.1 or higher version. Use - * {@link TunerVersionChecker.getTunerVersion()} to get the version information. + * {@link TunerVersionChecker#getTunerVersion()} to get the version information. */ @Filter.ScramblingStatus public int getScramblingStatus() { diff --git a/media/java/android/media/tv/tuner/filter/TsRecordEvent.java b/media/java/android/media/tv/tuner/filter/TsRecordEvent.java index 28161993e5c8..bf2c000cb6e8 100644 --- a/media/java/android/media/tv/tuner/filter/TsRecordEvent.java +++ b/media/java/android/media/tv/tuner/filter/TsRecordEvent.java @@ -83,8 +83,8 @@ public class TsRecordEvent extends FilterEvent { * and has the same format as the PTS in ISO/IEC 13818-1. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link android.media.tv.tuner.Tuner.INVALID_TIMESTAMP}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version + * return {@link android.media.tv.tuner.Tuner#INVALID_TIMESTAMP}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ public long getPts() { @@ -95,8 +95,8 @@ public class TsRecordEvent extends FilterEvent { * Get the address of the first macroblock in the slice defined in ITU-T Rec. H.264. * * <p>This field is only supported in Tuner 1.1 or higher version. Unsupported version will - * return {@link android.media.tv.tuner.Tuner.INVALID_FIRST_MACROBLOCK_IN_SLICE}. Use - * {@link android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version + * return {@link android.media.tv.tuner.Tuner#INVALID_FIRST_MACROBLOCK_IN_SLICE}. Use + * {@link android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version * information. */ public int getFirstMacroblockInSlice() { diff --git a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java index c6a5bb045a1d..b2c3fd243de0 100644 --- a/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/AnalogFrontendSettings.java @@ -264,7 +264,7 @@ public class AnalogFrontendSettings extends FrontendSettings { * Set Aft flag. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param aftFlag the value to set the aft flag. The default value is * {@link #AFT_FLAG_UNDEFINED}. diff --git a/media/java/android/media/tv/tuner/frontend/DtmbFrontendCapabilities.java b/media/java/android/media/tv/tuner/frontend/DtmbFrontendCapabilities.java index dd386b01003a..e856779225b9 100644 --- a/media/java/android/media/tv/tuner/frontend/DtmbFrontendCapabilities.java +++ b/media/java/android/media/tv/tuner/frontend/DtmbFrontendCapabilities.java @@ -46,8 +46,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets modulation capability. * - * @return full modulation capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.Modulation} is true, then that modulation is supported. + * @return the bit mask of all the supported modulations. */ @DtmbFrontendSettings.Modulation public int getModulationCapability() { @@ -57,9 +56,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets Transmission Mode capability. * - * @return full Transmission Mode capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.TransmissionMode} is true, then that transmission mode - * is supported. + * @return the bit mask of all the supported transmission modes. */ @DtmbFrontendSettings.TransmissionMode public int getTransmissionModeCapability() { @@ -69,9 +66,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets Guard Interval capability. * - * @return full Guard Interval capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.GuardInterval} is true, then that Guard Interval is - * supported. + * @return the bit mask of all the supported guard intervals. */ @DtmbFrontendSettings.GuardInterval public int getGuardIntervalCapability() { @@ -81,9 +76,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets Time Interleave Mode capability. * - * @return full Time Interleave Mode capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.TimeInterleaveMode} is true, then that Time Interleave - * Mode is supported. + * @return the bit mask of all the supported time interleave modes. */ @DtmbFrontendSettings.TimeInterleaveMode public int getTimeInterleaveModeCapability() { @@ -93,8 +86,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets Code Rate capability. * - * @return full Code Rate capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.CodeRate} is true, then that Code Rate is supported. + * @return the bit mask of all the supported code rates. */ @DtmbFrontendSettings.CodeRate public int getCodeRateCapability() { @@ -104,8 +96,7 @@ public final class DtmbFrontendCapabilities extends FrontendCapabilities { /** * Gets Bandwidth capability. * - * @return full Bandwidth capabilies. If the caps bitwise AND with any value from - * bit masks {@link DtmbFrontendSettings.Bandwidth} is true, then that Bandwidth is supported. + * @return the bit mask of all the supported bandwidth. */ @DtmbFrontendSettings.Bandwidth public int getBandwidthCapability() { diff --git a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java index d85e60d31f7c..c1d08339c690 100644 --- a/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DtmbFrontendSettings.java @@ -29,7 +29,7 @@ import java.lang.annotation.RetentionPolicy; * Frontend settings for DTMB. * * <p>DTMB Frontend is only supported in Tuner HAL 1.1 or higher. Use {@link - * android.media.tv.tuner.TunerVersionChecker.getTunerVersion()} to get the version information. + * android.media.tv.tuner.TunerVersionChecker#getTunerVersion()} to get the version information. * * @hide */ diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java index 948f4a77e361..0e08c1516b06 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendCapabilities.java @@ -45,9 +45,9 @@ 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 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 diff --git a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java index a611da669d35..db28631fe06c 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java @@ -120,7 +120,7 @@ public class DvbcFrontendSettings extends FrontendSettings { /** - * @deprecated Use the {@link FrontendSettings#FrontendSpectralInversion} instead. + * @deprecated Use the {@code FrontendSpectralInversion} instead. * @hide */ @Deprecated @@ -439,7 +439,7 @@ public class DvbcFrontendSettings extends FrontendSettings { * Set the time interleave mode. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param interleaveMode the value to set as the time interleave mode. Default value is * {@link #TIME_INTERLEAVE_MODE_UNDEFINED}. @@ -456,7 +456,7 @@ public class DvbcFrontendSettings extends FrontendSettings { * Set the Bandwidth. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param bandwidth the value to set as the bandwidth. Default value is * {@link #BANDWIDTH_UNDEFINED}. diff --git a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java index a2a602a44f3c..f68d554c50c2 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbsFrontendSettings.java @@ -344,7 +344,7 @@ public class DvbsFrontendSettings extends FrontendSettings { * Get if the client can handle the Diseqc Rx Message or not. Default value is false. * * The setter {@link Builder#setCanHandleDiseqcRxMessage(boolean)} is only supported with - * Tuner HAL 1.1 or higher. Use {@link TunerVersionChecker.getTunerVersion()} to check the + * Tuner HAL 1.1 or higher. Use {@link TunerVersionChecker#getTunerVersion()} to check the * version. */ public boolean canHandleDiseqcRxMessage() { @@ -394,7 +394,7 @@ public class DvbsFrontendSettings extends FrontendSettings { * Set the scan type. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param scanType the value to set as the scan type. Default value is * {@link android.media.tv.tuner.frontend.DvbsFrontendSettings#DVBS_SCAN_TYPE_UNDEFINED}. @@ -414,7 +414,7 @@ public class DvbsFrontendSettings extends FrontendSettings { * channel in the hardware layer. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull public Builder setCanHandleDiseqcRxMessage(boolean canHandleDiseqcMessage) { diff --git a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java index 07d179707b98..536c7b82d0af 100644 --- a/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/DvbtFrontendSettings.java @@ -586,7 +586,7 @@ public class DvbtFrontendSettings extends FrontendSettings { * * <p>{@link #TRANSMISSION_MODE_EXTENDED_8K}, {@link #TRANSMISSION_MODE_EXTENDED_16K} and * {@link #TRANSMISSION_MODE_EXTENDED_32K} are only supported by Tuner HAL 1.1 or higher. - * Unsupported version would cause no-op. Use {@link TunerVersionChecker.getTunerVersion()} + * Unsupported version would cause no-op. Use {@link TunerVersionChecker#getTunerVersion()} * to check the version. * * <p>Default value is {@link #TRANSMISSION_MODE_UNDEFINED}. @@ -617,7 +617,7 @@ public class DvbtFrontendSettings extends FrontendSettings { * <p>{@link #CONSTELLATION_QPSK_R}, {@link #CONSTELLATION_16QAM_R}, * {@link #CONSTELLATION_64QAM_R} and {@link #CONSTELLATION_256QAM_Rare} are only supported * by Tuner HAL 1.1 or higher. Unsupported version would cause no-op. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. * * <p>Default value is {@link #CONSTELLATION_UNDEFINED}. */ diff --git a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java index f3e94760c847..67d6e9d266c8 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendInfo.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendInfo.java @@ -57,7 +57,7 @@ public class FrontendInfo { /** * Gets frontend ID. * - * @return the frontend ID or {@link android.media.tv.tuner.Tuner.INVALID_FRONTEND_ID} + * @return the frontend ID or {@link android.media.tv.tuner.Tuner#INVALID_FRONTEND_ID} * if invalid */ public int getId() { diff --git a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java index f8470b11fdbd..4bfe8078be35 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendSettings.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendSettings.java @@ -321,7 +321,7 @@ public abstract class FrontendSettings { * Set Spectral Inversion. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param inversion the value to set as the spectral inversion. Default value is {@link * #FRONTEND_SPECTRAL_INVERSION_UNDEFINED}. @@ -338,7 +338,7 @@ public abstract class FrontendSettings { * would be no-op. * * <p>This API is only supported by Tuner HAL 1.1 or higher. Unsupported version would cause - * no-op. Use {@link TunerVersionChecker.getTunerVersion()} to check the version. + * no-op. Use {@link TunerVersionChecker#getTunerVersion()} to check the version. * * @param endFrequency the end frequency used during blind scan. The default value is * {@link android.media.tv.tuner.Tuner#INVALID_FRONTEND_SETTING_FREQUENCY}. diff --git a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java index c762da69eedf..4acaa58a1842 100644 --- a/media/java/android/media/tv/tuner/frontend/FrontendStatus.java +++ b/media/java/android/media/tv/tuner/frontend/FrontendStatus.java @@ -680,7 +680,7 @@ public class FrontendStatus { * Gets an array of the current extended bit error ratio. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull public int[] getBers() { @@ -696,7 +696,7 @@ public class FrontendStatus { * Gets an array of the current code rates. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull @FrontendSettings.InnerFec @@ -713,7 +713,7 @@ public class FrontendStatus { * Gets the current bandwidth information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @FrontendBandwidth public int getBandwidth() { @@ -729,7 +729,7 @@ public class FrontendStatus { * Gets the current guard interval information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @FrontendGuardInterval public int getGuardInterval() { @@ -745,7 +745,7 @@ public class FrontendStatus { * Gets the current transmission mode information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @FrontendTransmissionMode public int getTransmissionMode() { @@ -762,7 +762,7 @@ public class FrontendStatus { * since the last tune operation. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ public int getUec() { TunerVersionChecker.checkHigherOrEqualVersionTo( @@ -777,7 +777,7 @@ public class FrontendStatus { * Gets the current DVB-T2 system id. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @IntRange(from = 0, to = 0xffff) public int getSystemId() { @@ -793,7 +793,7 @@ public class FrontendStatus { * Gets an array of the current interleaving mode information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull @FrontendInterleaveMode @@ -811,7 +811,7 @@ public class FrontendStatus { * channels. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull @IntRange(from = 0, to = 0xff) @@ -828,7 +828,7 @@ public class FrontendStatus { * Gets an array of the Transport Stream Data Rate in BPS of the current channel. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull public int[] getTsDataRate() { @@ -844,7 +844,7 @@ public class FrontendStatus { * Gets an array of the current extended modulations information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @NonNull @FrontendModulation @@ -861,7 +861,7 @@ public class FrontendStatus { * Gets the current roll off information. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ @FrontendRollOff public int getRollOff() { @@ -877,7 +877,7 @@ public class FrontendStatus { * Gets is MISO enabled or not. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ public boolean isMisoEnabled() { TunerVersionChecker.checkHigherOrEqualVersionTo( @@ -892,7 +892,7 @@ public class FrontendStatus { * Gets is the Code Rate of the frontend is linear or not. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ public boolean isLinear() { TunerVersionChecker.checkHigherOrEqualVersionTo( @@ -907,7 +907,7 @@ public class FrontendStatus { * Gets is the Short Frames enabled or not. * * <p>This query is only supported by Tuner HAL 1.1 or higher. Use - * {@link TunerVersionChecker.getTunerVersion()} to check the version. + * {@link TunerVersionChecker#getTunerVersion()} to check the version. */ public boolean isShortFramesEnabled() { TunerVersionChecker.checkHigherOrEqualVersionTo( |