Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dummy implementation get/setMute calls of ITuner.

Browse Source 
This is also not implemented in the native service.

Test: instrumentation
Bug: b/36863239
Change-Id: I2e5ceaec7a98eec0af6101a2f91dabd1cde2e090
This commit is contained in:
Tomasz Wasilczyk
2017-05-03 09:09:57 -07:00
parent 0767c5ed64
commit 9fa0287c18
5 changed files with 95 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/hardware/radio/ITuner.aidl
View File

@@ -30,4 +30,11 @@ interface ITuner {
RadioManager.BandConfig getConfiguration();
int getProgramInformation(out RadioManager.ProgramInfo[] infoOut);
/**
* @throws IllegalStateException if tuner was opened without audio
*/
void setMuted(boolean mute);
boolean isMuted();
}

30
core/java/android/hardware/radio/TunerAdapter.java
View File

@@ -21,7 +21,6 @@ import android.annotation.Nullable;
import android.os.RemoteException;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
/**
@@ -65,7 +64,8 @@ class TunerAdapter extends RadioTuner {
Log.e(TAG, "Can't set configuration", e);
return RadioManager.STATUS_BAD_VALUE;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
Log.e(TAG, "service died", e);
return RadioManager.STATUS_DEAD_OBJECT;
}
}
@@ -78,20 +78,33 @@ class TunerAdapter extends RadioTuner {
config[0] = mTuner.getConfiguration();
return RadioManager.STATUS_OK;
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
Log.e(TAG, "service died", e);
return RadioManager.STATUS_DEAD_OBJECT;
}
}
@Override
public int setMute(boolean mute) {
// TODO(b/36863239): forward to mTuner
throw new RuntimeException("Not implemented");
try {
mTuner.setMuted(mute);
} catch (IllegalStateException e) {
Log.e(TAG, "Can't set muted", e);
return RadioManager.STATUS_ERROR;
} catch (RemoteException e) {
Log.e(TAG, "service died", e);
return RadioManager.STATUS_DEAD_OBJECT;
}
return RadioManager.STATUS_OK;
}
@Override
public boolean getMute() {
// TODO(b/36863239): forward to mTuner
throw new RuntimeException("Not implemented");
try {
return mTuner.isMuted();
} catch (RemoteException e) {
Log.e(TAG, "service died", e);
return true;
}
}
@Override
@@ -126,7 +139,8 @@ class TunerAdapter extends RadioTuner {
try {
return mTuner.getProgramInformation(info);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
Log.e(TAG, "service died", e);
return RadioManager.STATUS_DEAD_OBJECT;
}
}