Merge "Implement isAntennaConnected interface of ITuner."

2017-05-18 04:06:21 +00:00
parent 23c40a6079 39ac214838
commit e876f8f845
5 changed files with 39 additions and 5 deletions
--- a/core/java/android/hardware/radio/ITuner.aidl
+++ b/core/java/android/hardware/radio/ITuner.aidl
@@ -84,4 +84,6 @@ interface ITuner {
     *         configuration.
     */
    void setAnalogForced(boolean isForced);
+
+    boolean isAntennaConnected();
 }
--- a/core/java/android/hardware/radio/TunerAdapter.java
+++ b/core/java/android/hardware/radio/TunerAdapter.java
@@ -218,8 +218,11 @@ class TunerAdapter extends RadioTuner {

    @Override
    public boolean isAntennaConnected() {
-        // TODO(b/36863239): forward to mTuner
-        throw new RuntimeException("Not implemented");
+        try {
+            return mTuner.isAntennaConnected();
+        } catch (RemoteException e) {
+            throw new RuntimeException("service died", e);
+        }
    }

    @Override