Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change byte fields to int

Browse Source 
Test: make;
Bug: 139308734
Change-Id: I8e3ae5f85a27355828b47e5962b4c868997a0765
This commit is contained in:
shubang
2020-01-28 13:46:40 -08:00
parent 1636af3a1a
commit c9786d6b28
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/system-current.txt
View File

@@ -5377,7 +5377,7 @@ package android.media.tv.tuner.frontend {
public static class Atsc3FrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder> {
method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings build();
method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setBandwidth(int);
method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setDemodOutputFormat(byte);
method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setDemodOutputFormat(int);
method @NonNull public android.media.tv.tuner.frontend.Atsc3FrontendSettings.Builder setPlpSettings(@NonNull android.media.tv.tuner.frontend.Atsc3PlpSettings[]);
}
@@ -5431,7 +5431,7 @@ package android.media.tv.tuner.frontend {
public class DvbcFrontendSettings extends android.media.tv.tuner.frontend.FrontendSettings {
method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_TV_TUNER) public static android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder builder(@NonNull android.content.Context);
method public byte getAnnex();
method public int getAnnex();
method public long getFec();
method public int getModulation();
method public int getOuterFec();
@@ -5459,7 +5459,7 @@ package android.media.tv.tuner.frontend {
public static class DvbcFrontendSettings.Builder extends android.media.tv.tuner.frontend.FrontendSettings.Builder<android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder> {
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings build();
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(byte);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setAnnex(int);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setFec(long);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setModulation(int);
method @NonNull public android.media.tv.tuner.frontend.DvbcFrontendSettings.Builder setOuterFec(int);

4
media/java/android/media/tv/tuner/frontend/Atsc3FrontendSettings.java
View File

@@ -327,7 +327,7 @@ public class Atsc3FrontendSettings extends FrontendSettings {
*/
public static class Builder extends FrontendSettings.Builder<Builder> {
private int mBandwidth;
private byte mDemodOutputFormat;
private int mDemodOutputFormat;
private Atsc3PlpSettings[] mPlpSettings;
private Builder() {
@@ -345,7 +345,7 @@ public class Atsc3FrontendSettings extends FrontendSettings {
* Sets Demod Output Format.
*/
@NonNull
public Builder setDemodOutputFormat(byte demodOutputFormat) {
public Builder setDemodOutputFormat(@DemodOutputFormat int demodOutputFormat) {
mDemodOutputFormat = demodOutputFormat;
return this;
}

10
media/java/android/media/tv/tuner/frontend/DvbcFrontendSettings.java
View File

@@ -147,11 +147,11 @@ public class DvbcFrontendSettings extends FrontendSettings {
private final long mFec;
private final int mSymbolRate;
private final int mOuterFec;
private final byte mAnnex;
private final int mAnnex;
private final int mSpectralInversion;
private DvbcFrontendSettings(int frequency, int modulation, long fec, int symbolRate,
int outerFec, byte annex, int spectralInversion) {
int outerFec, int annex, int spectralInversion) {
super(frequency);
mModulation = modulation;
mFec = fec;
@@ -192,7 +192,7 @@ public class DvbcFrontendSettings extends FrontendSettings {
* Gets Annex.
*/
@Annex
public byte getAnnex() {
public int getAnnex() {
return mAnnex;
}
/**
@@ -223,7 +223,7 @@ public class DvbcFrontendSettings extends FrontendSettings {
private long mFec;
private int mSymbolRate;
private int mOuterFec;
private byte mAnnex;
private int mAnnex;
private int mSpectralInversion;
private Builder() {
@@ -265,7 +265,7 @@ public class DvbcFrontendSettings extends FrontendSettings {
* Sets Annex.
*/
@NonNull
public Builder setAnnex(@Annex byte annex) {
public Builder setAnnex(@Annex int annex) {
mAnnex = annex;
return this;
}