Merge "Address Broadcast Radio HAL review notes." into oc-mr1-dev (36ea87b0) · Commits · e / os / android_frameworks_base

core/java/android/hardware/radio/ITunerCallback.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ import android.hardware.radio.RadioMetadata;
		oneway interface ITunerCallback {
		void onError(int status);
		void onConfigurationChanged(in RadioManager.BandConfig config);
		void onProgramInfoChanged();
		void onCurrentProgramInfoChanged();
		void onTrafficAnnouncement(boolean active);
		void onEmergencyAnnouncement(boolean active);
		void onAntennaState(boolean connected);

core/java/android/hardware/radio/TunerCallbackAdapter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ class TunerCallbackAdapter extends ITunerCallback.Stub {
		synchronized (mLock) {
		if (mTuner != null) throw new IllegalStateException();
		mTuner = tuner;
		if (mPendingProgramInfoChanged) onProgramInfoChanged();
		if (mPendingProgramInfoChanged) onCurrentProgramInfoChanged();
		}
		}

		@@ -64,7 +64,7 @@ class TunerCallbackAdapter extends ITunerCallback.Stub {
		}

		@Override
		public void onProgramInfoChanged() {
		public void onCurrentProgramInfoChanged() {
		synchronized (mLock) {
		if (mTuner == null) {
		mPendingProgramInfoChanged = true;

services/core/java/com/android/server/broadcastradio/TunerCallback.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -86,8 +86,8 @@ class TunerCallback implements ITunerCallback {
		}

		@Override
		public void onProgramInfoChanged() {
		dispatch(() -> mClientCallback.onProgramInfoChanged());
		public void onCurrentProgramInfoChanged() {
		dispatch(() -> mClientCallback.onCurrentProgramInfoChanged());
		}

		@Override

services/core/jni/BroadcastRadio/Tuner.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -296,7 +296,7 @@ static void nativeTune(JNIEnv *env, jobject obj, jlong nativeContext, jobject jS

		auto selector = convert::ProgramSelectorToHal(env, jSelector);
		if (halTuner11 != nullptr) {
		convert::ThrowIfFailed(env, halTuner11->tune_1_1(selector));
		convert::ThrowIfFailed(env, halTuner11->tuneByProgramSelector(selector));
		} else {
		uint32_t channel, subChannel;
		if (!V1_1::utils::getLegacyChannel(selector, &channel, &subChannel)) {

services/core/jni/BroadcastRadio/TunerCallback.cpp

+8 −8

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ static struct {
		jmethodID handleHwFailure;
		jmethodID onError;
		jmethodID onConfigurationChanged;
		jmethodID onProgramInfoChanged;
		jmethodID onCurrentProgramInfoChanged;
		jmethodID onTrafficAnnouncement;
		jmethodID onEmergencyAnnouncement;
		jmethodID onAntennaState;
		@@ -111,7 +111,7 @@ public:
		virtual Return<void> backgroundScanAvailable(bool isAvailable);
		virtual Return<void> backgroundScanComplete(ProgramListResult result);
		virtual Return<void> programListChanged();
		virtual Return<void> programInfoChanged();
		virtual Return<void> currentProgramInfoChanged();
		};

		struct TunerCallbackContext {
		@@ -192,7 +192,7 @@ Return<void> NativeCallback::tuneComplete_1_1(Result result, const ProgramSelect

		mCallbackThread.enqueue([result, this](JNIEnv *env) {
		if (result == Result::OK) {
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onProgramInfoChanged);
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onCurrentProgramInfoChanged);
		} else {
		TunerError cause = TunerError::CANCELLED;
		if (result == Result::TIMEOUT) cause = TunerError::SCAN_TIMEOUT;
		@@ -254,7 +254,7 @@ Return<void> NativeCallback::newMetadata(uint32_t channel, uint32_t subChannel,
		}

		mCallbackThread.enqueue([this, metadata](JNIEnv *env) {
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onProgramInfoChanged);
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onCurrentProgramInfoChanged);
		});

		return Return<void>();
		@@ -297,11 +297,11 @@ Return<void> NativeCallback::programListChanged() {
		return Return<void>();
		}

		Return<void> NativeCallback::programInfoChanged() {
		Return<void> NativeCallback::currentProgramInfoChanged() {
		ALOGV("%s", __func__);

		mCallbackThread.enqueue([this](JNIEnv *env) {
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onProgramInfoChanged);
		env->CallVoidMethod(mJCallback, gjni.TunerCallback.onCurrentProgramInfoChanged);
		});

		return Return<void>();
		@@ -379,8 +379,8 @@ void register_android_server_broadcastradio_TunerCallback(JavaVM vm, JNIEnv en
		gjni.TunerCallback.onError = GetMethodIDOrDie(env, tunerCbClass, "onError", "(I)V");
		gjni.TunerCallback.onConfigurationChanged = GetMethodIDOrDie(env, tunerCbClass,
		"onConfigurationChanged", "(Landroid/hardware/radio/RadioManager$BandConfig;)V");
		gjni.TunerCallback.onProgramInfoChanged = GetMethodIDOrDie(env, tunerCbClass,
		"onProgramInfoChanged", "()V");
		gjni.TunerCallback.onCurrentProgramInfoChanged = GetMethodIDOrDie(env, tunerCbClass,
		"onCurrentProgramInfoChanged", "()V");
		gjni.TunerCallback.onTrafficAnnouncement = GetMethodIDOrDie(env, tunerCbClass,
		"onTrafficAnnouncement", "(Z)V");
		gjni.TunerCallback.onEmergencyAnnouncement = GetMethodIDOrDie(env, tunerCbClass,