Merge "Renaming AAC variants to their more technical forms." into jb-dev
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 1430ea4..8f3ae50 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -291,8 +291,7 @@
{ AUDIO_ENCODER_AMR_NB, "AMR_NB" },
{ AUDIO_ENCODER_AMR_WB, "AMR_WB" },
{ AUDIO_ENCODER_AAC, "AAC" },
- { AUDIO_ENCODER_AAC_PLUS, "AAC+" },
- { AUDIO_ENCODER_EAAC_PLUS, "EAAC+" },
+ { AUDIO_ENCODER_HE_AAC, "AAC+" },
{ AUDIO_ENCODER_LIST_END, "disabled"},
};
@@ -2506,4 +2505,3 @@
system("echo camerahal_test > /sys/power/wake_unlock");
return 0;
}
-