commit 180113a6240e8cabbcb8df10f70e7c43334d9c43
author Dave Burke <daveburke@google.com> Sun Apr 29 21:15:28 2012 -0700
committer Dave Burke <daveburke@google.com> Mon Apr 30 09:17:34 2012 -0700
tree 1ed9528922356d31013d9defb378bffc1ddd5b29
parent 726dfe7cd16efb9640283c86504cf1a3fb857277

Renaming AAC variants to their more technical forms.

Bug: 6275957

Change-Id: I3a01cc670b19b2be1ccd5a7196b5c3489d87d11d

test/CameraHal/camera_test_menu.cpp

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;
 }
-