summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorJooyung Han <jooyung@google.com>2021-08-19 21:01:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-08-19 21:01:19 +0000
commit6f3ebef58828a5ca3ecdcff085b508db18bc2cd7 (patch)
treed1e57b6e7f4bab95dc4b24ac6179b857ccbd6752 /core/java/android
parent332cd02609c4c8954ea4cf8aa878c338248a1ab8 (diff)
parent54a1fd2e0f017be3992216707fe5e57696813f28 (diff)
Merge "tuner: use typed Map<String, String>"
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/hardware/radio/ITuner.aidl10
-rw-r--r--core/java/android/hardware/radio/ITunerCallback.aidl4
-rw-r--r--core/java/android/hardware/radio/TunerCallbackAdapter.java2
3 files changed, 8 insertions, 8 deletions
diff --git a/core/java/android/hardware/radio/ITuner.aidl b/core/java/android/hardware/radio/ITuner.aidl
index 429f1f351a93..7bf234b9d5a4 100644
--- a/core/java/android/hardware/radio/ITuner.aidl
+++ b/core/java/android/hardware/radio/ITuner.aidl
@@ -80,14 +80,14 @@ interface ITuner {
void setConfigFlag(int flag, boolean value);
/**
- * @param parameters Vendor-specific key-value pairs, must be Map<String, String>
- * @return Vendor-specific key-value pairs, must be Map<String, String>
+ * @param parameters Vendor-specific key-value pairs
+ * @return Vendor-specific key-value pairs
*/
- Map setParameters(in Map parameters);
+ Map<String, String> setParameters(in Map<String, String> parameters);
/**
* @param keys Parameter keys to fetch
- * @return Vendor-specific key-value pairs, must be Map<String, String>
+ * @return Vendor-specific key-value pairs
*/
- Map getParameters(in List<String> keys);
+ Map<String, String> getParameters(in List<String> keys);
}
diff --git a/core/java/android/hardware/radio/ITunerCallback.aidl b/core/java/android/hardware/radio/ITunerCallback.aidl
index b32daa5a7609..f98947b50e34 100644
--- a/core/java/android/hardware/radio/ITunerCallback.aidl
+++ b/core/java/android/hardware/radio/ITunerCallback.aidl
@@ -36,7 +36,7 @@ oneway interface ITunerCallback {
void onProgramListUpdated(in ProgramList.Chunk chunk);
/**
- * @param parameters Vendor-specific key-value pairs, must be Map<String, String>
+ * @param parameters Vendor-specific key-value pairs
*/
- void onParametersUpdated(in Map parameters);
+ void onParametersUpdated(in Map<String, String> parameters);
}
diff --git a/core/java/android/hardware/radio/TunerCallbackAdapter.java b/core/java/android/hardware/radio/TunerCallbackAdapter.java
index beff0f7607f8..e3f7001d8740 100644
--- a/core/java/android/hardware/radio/TunerCallbackAdapter.java
+++ b/core/java/android/hardware/radio/TunerCallbackAdapter.java
@@ -220,7 +220,7 @@ class TunerCallbackAdapter extends ITunerCallback.Stub {
}
@Override
- public void onParametersUpdated(Map parameters) {
+ public void onParametersUpdated(Map<String, String> parameters) {
mHandler.post(() -> mCallback.onParametersUpdated(parameters));
}
}