Merge "Fix VMS public API based on API review (ag/2593725)." into oc-mr1-dev
diff --git a/tests/EmbeddedKitchenSinkApp/res/raw/john_harrison_with_the_wichita_state_university_chamber_players_05_summer_mvt_2_adagio.mp3 b/tests/EmbeddedKitchenSinkApp/res/raw/john_harrison_with_the_wichita_state_university_chamber_players_05_summer_mvt_2_adagio.mp3
deleted file mode 100644
index 25e6be6..0000000
--- a/tests/EmbeddedKitchenSinkApp/res/raw/john_harrison_with_the_wichita_state_university_chamber_players_05_summer_mvt_2_adagio.mp3
+++ /dev/null
Binary files differ
diff --git a/tests/EmbeddedKitchenSinkApp/res/raw/well_worth_the_wait.mp3 b/tests/EmbeddedKitchenSinkApp/res/raw/well_worth_the_wait.mp3
new file mode 100644
index 0000000..a1db0bc
--- /dev/null
+++ b/tests/EmbeddedKitchenSinkApp/res/raw/well_worth_the_wait.mp3
Binary files differ
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
index 81e8737..ce90651 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java
@@ -175,7 +175,7 @@
//ignore for now
}
- mMusicPlayer = new AudioPlayer(mContext, R.raw.john_harrison_with_the_wichita_state_university_chamber_players_05_summer_mvt_2_adagio,
+ mMusicPlayer = new AudioPlayer(mContext, R.raw.well_worth_the_wait,
mMusicAudioAttrib);
mMusicPlayerShort = new AudioPlayer(mContext, R.raw.ring_classic_01,
mMusicAudioAttrib);
diff --git a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
index bb84def..c60496b 100644
--- a/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
+++ b/tests/android_support_car_api_test/src/com/android/support/car/apitest/CarSensorManagerTest.java
@@ -110,22 +110,24 @@
}
StringBuilder builder = new StringBuilder();
boolean failed = false;
- for (Field supprotCarSensorType : supportCarSensorTypes) {
+ for (Field supportCarSensorType : supportCarSensorTypes) {
Field androidCarSensorType = androidCarSensorTypeToField.get(
- supprotCarSensorType.getInt(null));
- assertNotNull("Sensor type:" + supprotCarSensorType.getName() +
+ supportCarSensorType.getInt(null));
+ assertNotNull("Sensor type:" + supportCarSensorType.getName() +
" not defined in android.car", androidCarSensorType);
- if (supprotCarSensorType.getName().equals(androidCarSensorType.getName())) {
+ if (supportCarSensorType.getName().equals(androidCarSensorType.getName())) {
// match ok
} else if (androidCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) {
// not used in android.car, ok
+ } else if (supportCarSensorType.getName().startsWith("SENSOR_TYPE_RESERVED")) {
+ // used in android.car but reserved in support.car
} else {
failed = true;
- builder.append("android.support sensor has name:" + supprotCarSensorType.getName() +
+ builder.append("android.support sensor has name:" + supportCarSensorType.getName() +
" while android.car sensor has name:" + androidCarSensorType.getName() +
"\n");
}
- androidCarSensorTypeToField.remove(supprotCarSensorType.getInt(null));
+ androidCarSensorTypeToField.remove(supportCarSensorType.getInt(null));
}
assertFalse(builder.toString(), failed);
assertTrue("android Car sensor has additional types defined:" + androidCarSensorTypeToField,