Merge "NNAPI Combine Compatability test with VTS test"
diff --git a/dumpstate/1.0/default/Android.bp b/dumpstate/1.0/default/Android.bp
index 3ca19e8..9f14aaf 100644
--- a/dumpstate/1.0/default/Android.bp
+++ b/dumpstate/1.0/default/Android.bp
@@ -1,5 +1,5 @@
cc_binary {
- name: "android.hardware.dumpstate@1.0-service",
+ name: "android.hardware.dumpstate@1.0-service.example",
init_rc: ["android.hardware.dumpstate@1.0-service.rc"],
relative_install_path: "hw",
vendor: true,
diff --git a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
index 062a291..03298dc 100644
--- a/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
+++ b/dumpstate/1.0/default/android.hardware.dumpstate@1.0-service.rc
@@ -1,4 +1,4 @@
-service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service
+service vendor.dumpstate-1-0 /vendor/bin/hw/android.hardware.dumpstate@1.0-service.example
class hal
user system
group system
diff --git a/tv/tuner/1.0/types.hal b/tv/tuner/1.0/types.hal
index 3fa9641..4ee03a0 100644
--- a/tv/tuner/1.0/types.hal
+++ b/tv/tuner/1.0/types.hal
@@ -90,10 +90,10 @@
};
/**
- * Signal Setting for ATSC Frontend.
+ * Signal Settings for an ATSC Frontend.
*/
struct FrontendAtscSettings {
- /** Signal frequencey in Herhz */
+ /** Signal frequency in Hertz */
uint32_t frequency;
FrontendAtscModulation modulation;
};
@@ -102,7 +102,7 @@
* Signal Setting for DVBT Frontend.
*/
struct FrontendDvbtSettings {
- /** Signal frequencey in Herhz */
+ /** Signal frequency in Hertz */
uint32_t frequency;
FrontendAtscModulation modulation;
FrontendInnerFec fec;