Merge "Change byte fields to int" (dfe9f394) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -5378,7 +5378,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[]);
		}

		@@ -5432,7 +5432,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();
		@@ -5460,7 +5460,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);

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -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;
		}