FMRadio: Generalize Built-In FM Antenna support (f4065dbc) · Commits · e / os / android_packages_apps_FMRadio

src/com/android/fmradio/FmFavoriteActivity.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -513,7 +513,7 @@ public class FmFavoriteActivity extends Activity {
		bundle = msg.getData();
		boolean isHeadset = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANTENNA);
		// if receive headset plugout, need set headset mode on ui
		if (!isHeadset && !FmUtils.hasMtkFmShortAntennaSupport()) {
		if (!isHeadset && !FmUtils.hasBuiltInFmAntennaSupport()) {
		finish();
		}
		break;

+3 −3

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ public class FmMainActivity extends Activity implements FmFavoriteEditDialog.Edi
		case FmListener.MSGID_SWITCH_ANTENNA:
		bundle = msg.getData();
		boolean hasAntenna = bundle.getBoolean(FmListener.KEY_IS_SWITCH_ANTENNA) \|\|
		FmUtils.hasMtkFmShortAntennaSupport();
		FmUtils.hasBuiltInFmAntennaSupport();
		// if receive headset plug out, need set headset mode on ui
		if (hasAntenna) {
		if (mIsActivityForeground) {
		@@ -853,8 +853,8 @@ public class FmMainActivity extends Activity implements FmFavoriteEditDialog.Edi
		* @return true or false indicate antenna available or not
		*/
		private boolean isAntennaAvailable() {
		if (FmUtils.hasMtkFmShortAntennaSupport()) {
		return true; // Support wireless FM Radio on MTK chips
		if (FmUtils.hasBuiltInFmAntennaSupport()) {
		return true;
		}
		return mAudioManager.isWiredHeadsetOn();
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -363,8 +363,8 @@ public class FmService extends Service implements FmRecorder.OnRecorderStateChan
		* @return true, antenna available; false, antenna not available
		*/
		public boolean isAntennaAvailable() {
		if (FmUtils.hasMtkFmShortAntennaSupport()) {
		return true; // Support wireless FM Radio on MTK chips
		if (FmUtils.hasBuiltInFmAntennaSupport()) {
		return true;
		}
		return mAudioManager.isWiredHeadsetOn();
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -324,7 +324,7 @@ public class FmUtils {
		editor.commit();
		}

		public static boolean hasMtkFmShortAntennaSupport() {
		return SystemProperties.get("ro.vendor.mtk_fm_short_antenna_support").equals("1");
		public static boolean hasBuiltInFmAntennaSupport() {
		return SystemProperties.get("ro.vendor.builtin_fm_antenna_support").equals("1");
		}
		}