diff options
5 files changed, 14 insertions, 14 deletions
diff --git a/core/java/android/hardware/radio/ITunerCallback.aidl b/core/java/android/hardware/radio/ITunerCallback.aidl index c3bbaec85134..a09a6864ac6e 100644 --- a/core/java/android/hardware/radio/ITunerCallback.aidl +++ b/core/java/android/hardware/radio/ITunerCallback.aidl @@ -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); diff --git a/core/java/android/hardware/radio/TunerCallbackAdapter.java b/core/java/android/hardware/radio/TunerCallbackAdapter.java index 00a36c8af1a5..02ca52ed84fc 100644 --- a/core/java/android/hardware/radio/TunerCallbackAdapter.java +++ b/core/java/android/hardware/radio/TunerCallbackAdapter.java @@ -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; diff --git a/services/core/java/com/android/server/broadcastradio/TunerCallback.java b/services/core/java/com/android/server/broadcastradio/TunerCallback.java index 25f3775e27de..331b6574ee92 100644 --- a/services/core/java/com/android/server/broadcastradio/TunerCallback.java +++ b/services/core/java/com/android/server/broadcastradio/TunerCallback.java @@ -86,8 +86,8 @@ class TunerCallback implements ITunerCallback { } @Override - public void onProgramInfoChanged() { - dispatch(() -> mClientCallback.onProgramInfoChanged()); + public void onCurrentProgramInfoChanged() { + dispatch(() -> mClientCallback.onCurrentProgramInfoChanged()); } @Override diff --git a/services/core/jni/BroadcastRadio/Tuner.cpp b/services/core/jni/BroadcastRadio/Tuner.cpp index f5a85c1bbd83..aa1925ad365a 100644 --- a/services/core/jni/BroadcastRadio/Tuner.cpp +++ b/services/core/jni/BroadcastRadio/Tuner.cpp @@ -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)) { diff --git a/services/core/jni/BroadcastRadio/TunerCallback.cpp b/services/core/jni/BroadcastRadio/TunerCallback.cpp index 04bdddf61aa0..e01d8fa0b152 100644 --- a/services/core/jni/BroadcastRadio/TunerCallback.cpp +++ b/services/core/jni/BroadcastRadio/TunerCallback.cpp @@ -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, |