Merge "Update to use the correct logging library."

audio/2.0/default/Device.cpp

@@ -21,7 +21,7 @@
 #include <memory.h>
 #include <string.h>
 
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "Conversions.h"
 #include "Device.h"

audio/2.0/default/DevicesFactory.cpp

@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "Device.h"
 #include "DevicesFactory.h"

audio/2.0/default/Stream.cpp

@@ -21,7 +21,7 @@
 #include <hardware/audio.h>
 #include <hardware/audio_effect.h>
 #include <media/TypeConverter.h>
-#include <utils/Log.h>
+#include <android/log.h>
 #include <utils/SortedVector.h>
 #include <utils/Vector.h>
 

audio/2.0/default/StreamIn.cpp

@@ -17,7 +17,7 @@
 #define LOG_TAG "StreamInHAL"
 
 #include <hardware/audio.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "StreamIn.h"
 

audio/2.0/default/StreamOut.cpp

@@ -17,7 +17,7 @@
 #define LOG_TAG "StreamOutHAL"
 
 #include <hardware/audio.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "StreamOut.h"
 

audio/effect/2.0/default/AcousticEchoCancelerEffect.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "AEC_Effect_HAL"
 #include <system/audio_effects/effect_aec.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "AcousticEchoCancelerEffect.h"
 

audio/effect/2.0/default/AutomaticGainControlEffect.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "AGC_Effect_HAL"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "AutomaticGainControlEffect.h"
 

audio/effect/2.0/default/BassBoostEffect.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "BassBoost_HAL"
 #include <system/audio_effects/effect_bassboost.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "BassBoostEffect.h"
 

audio/effect/2.0/default/DownmixEffect.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "Downmix_HAL"
 #include <system/audio_effects/effect_downmix.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "DownmixEffect.h"
 

audio/effect/2.0/default/Effect.cpp

@@ -18,7 +18,7 @@
 
 #define LOG_TAG "EffectHAL"
 #include <media/EffectsFactoryApi.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "Conversions.h"
 #include "Effect.h"

audio/effect/2.0/default/EffectsFactory.cpp

@@ -27,7 +27,7 @@
 #include <system/audio_effects/effect_presetreverb.h>
 #include <system/audio_effects/effect_virtualizer.h>
 #include <system/audio_effects/effect_visualizer.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "AcousticEchoCancelerEffect.h"
 #include "AutomaticGainControlEffect.h"

audio/effect/2.0/default/EnvironmentalReverbEffect.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "EnvReverb_HAL"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "EnvironmentalReverbEffect.h"
 

audio/effect/2.0/default/EqualizerEffect.cpp

@@ -17,7 +17,7 @@
 #include <memory.h>
 
 #define LOG_TAG "Equalizer_HAL"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "EqualizerEffect.h"
 

audio/effect/2.0/default/LoudnessEnhancerEffect.cpp

@@ -18,7 +18,7 @@
 
 #define LOG_TAG "LoudnessEnhancer_HAL"
 #include <system/audio_effects/effect_aec.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "LoudnessEnhancerEffect.h"
 

audio/effect/2.0/default/NoiseSuppressionEffect.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "NS_Effect_HAL"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "NoiseSuppressionEffect.h"
 

audio/effect/2.0/default/PresetReverbEffect.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "PresetReverb_HAL"
 #include <system/audio_effects/effect_presetreverb.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "PresetReverbEffect.h"
 

audio/effect/2.0/default/VirtualizerEffect.cpp

@@ -18,7 +18,7 @@
 
 #define LOG_TAG "Virtualizer_HAL"
 #include <system/audio_effects/effect_virtualizer.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "VirtualizerEffect.h"
 

audio/effect/2.0/default/VisualizerEffect.cpp

@@ -16,7 +16,7 @@
 
 #define LOG_TAG "Visualizer_HAL"
 #include <system/audio_effects/effect_visualizer.h>
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "VisualizerEffect.h"
 

audio/effect/2.0/vts/functional/audio_effect_hidl_hal_test.cpp

@@ -164,6 +164,6 @@ int main(int argc, char** argv) {
   ::testing::AddGlobalTestEnvironment(new AudioEffectHidlEnvironment);
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
   return status;
 }

biometrics/fingerprint/2.1/default/BiometricsFingerprint.h

@@ -17,7 +17,7 @@
 #ifndef ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 #define ANDROID_HARDWARE_BIOMETRICS_FINGERPRINT_V2_1_BIOMETRICSFINGERPRINT_H
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include <hidl/MQDescriptor.h>
 #include <android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h>
 #include <hidl/Status.h>

broadcastradio/1.0/default/BroadcastRadio.cpp

@@ -16,7 +16,7 @@
 #define LOG_TAG "BroadcastRadio"
 //#define LOG_NDEBUG 0
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include <hardware/radio.h>
 
 #include "BroadcastRadio.h"

broadcastradio/1.0/default/Tuner.cpp

@@ -17,7 +17,7 @@
 #define LOG_TAG "Tuner"
 //#define LOG_NDEBUG 0
 
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "BroadcastRadio.h"
 #include "Tuner.h"

broadcastradio/1.0/default/Utils.cpp

@@ -16,7 +16,7 @@
 #define LOG_TAG "BroadcastRadioHalUtils"
 //#define LOG_NDEBUG 0
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include <utils/misc.h>
 #include <system/radio_metadata.h>
 

example/extension/light/2.0/default/service.cpp

@@ -15,7 +15,7 @@
  */
 #define LOG_TAG "android.hardware.light@2.0-service"
 
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include "Light.h"
 

gatekeeper/1.0/default/Gatekeeper.cpp

@@ -15,7 +15,7 @@
  */
 #define LOG_TAG "android.hardware.gatekeeper@1.0-service"
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include <dlfcn.h>
 
 #include "Gatekeeper.h"

gatekeeper/1.0/vts/functional/gatekeeper_hidl_hal_test.cpp

@@ -26,7 +26,7 @@
 
 #include <hardware/hw_auth_token.h>
 
-#include <android-base/logging.h>
+#include <android/log.h>
 #include <android/hardware/gatekeeper/1.0/IGatekeeper.h>
 #include <android/hardware/gatekeeper/1.0/types.h>
 

graphics/allocator/2.0/vts/functional/graphics_allocator_hidl_hal_test.cpp

@@ -307,7 +307,7 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
 
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
 
   return status;
 }

light/2.0/default/Light.cpp

@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#define LOG_TAG "light"
+#include <android/log.h>
+
 #include "Light.h"
 
 namespace android {

light/2.0/vts/functional/Android.bp

@@ -19,6 +19,7 @@ cc_test {
     gtest: true,
     srcs: ["light_hidl_hal_test.cpp"],
     shared_libs: [
+        "libbase",
         "liblog",
         "libutils",
         "android.hardware.light@2.0",

light/2.0/vts/functional/light_hidl_hal_test.cpp

@@ -44,7 +44,7 @@ public:
         light = ILight::getService(LIGHT_SERVICE_NAME);
 
         ASSERT_NE(light, nullptr);
-        ALOGI("Test is remote: %d", light->isRemote());
+        LOG(INFO) << "Test is remote " << light->isRemote();
     }
 
     virtual void TearDown() override {}
@@ -98,6 +98,6 @@ int main(int argc, char **argv) {
     ::testing::AddGlobalTestEnvironment(new LightHidlEnvironment);
     ::testing::InitGoogleTest(&argc, argv);
     int status = RUN_ALL_TESTS();
-    ALOGI("Test result = %d", status);
+    LOG(INFO) << "Test result = " << status;
     return status;
 }

memtrack/1.0/default/Memtrack.cpp

@@ -17,6 +17,7 @@
 #define LOG_TAG "android.hardware.memtrack@1.0-impl"
 #include <hardware/hardware.h>
 #include <hardware/memtrack.h>
+#include <android/log.h>
 
 #include "Memtrack.h"
 namespace android {

nfc/1.0/vts/functional/nfc_hidl_hal_test.cpp

@@ -356,7 +356,7 @@ int main(int argc, char** argv) {
   sleep(5);
 
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
 
   std::system("svc nfc enable"); /* Turn on NFC */
   sleep(5);

power/1.0/default/Power.cpp

@@ -17,6 +17,7 @@
 #define LOG_TAG "android.hardware.power@1.0-impl"
 #include <hardware/hardware.h>
 #include <hardware/power.h>
+#include <android/log.h>
 #include "Power.h"
 
 namespace android {

power/1.0/vts/functional/power_hidl_hal_test.cpp

@@ -103,6 +103,6 @@ TEST_F(PowerHidlTest, GetPlatformLowPowerStats) {
 int main(int argc, char **argv) {
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
   return status;
 }

soundtrigger/2.0/default/SoundTriggerHalImpl.cpp

@@ -17,7 +17,7 @@
 #define LOG_TAG "SoundTriggerHalImpl"
 //#define LOG_NDEBUG 0
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include "SoundTriggerHalImpl.h"
 
 

soundtrigger/2.0/vts/functional/soundtrigger_hidl_hal_test.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "SoundTriggerHidlHalTest"
-#include <android-base/logging.h>
+#include <android/log.h>
 #include <cutils/native_handle.h>
 
 #include <android/hardware/audio/common/2.0/types.h>

thermal/1.0/default/Thermal.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "android.hardware.thermal@1.0-impl"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <errno.h>
 #include <hardware/hardware.h>

thermal/1.0/vts/functional/thermal_hidl_hal_test.cpp

@@ -214,6 +214,6 @@ TEST_F(ThermalHidlTest, CoolingDeviceTest) {
 int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
   return status;
 }

vehicle/2.0/default/VehicleService.cpp

@@ -15,7 +15,7 @@
  */
 
 #define LOG_TAG "android.hardware.vehicle@2.0-service"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <iostream>
 

vehicle/2.0/default/impl/DefaultVehicleHal.cpp

@@ -16,6 +16,9 @@
 
 #include "DefaultVehicleHal.h"
 
+#define LOG_TAG "default_vehicle"
+#include <android/log.h>
+
 namespace android {
 namespace hardware {
 namespace vehicle {

vehicle/2.0/default/vehicle_hal_manager/SubscriptionManager.h

@@ -22,7 +22,7 @@
 #include <set>
 #include <list>
 
-#include <utils/Log.h>
+#include <android/log.h>
 #include <hwbinder/IPCThreadState.h>
 
 #include <android/hardware/vehicle/2.0/IVehicle.h>

vehicle/2.0/default/vehicle_hal_manager/VehicleHalManager.cpp

@@ -18,7 +18,7 @@
 #include <cmath>
 
 #include <utils/Errors.h>
-#include <utils/Log.h>
+#include <android/log.h>
 #include <hidl/Status.h>
 #include <future>
 #include <bitset>

vehicle/2.0/default/vehicle_hal_manager/VehicleObjectPool.h

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
+
 #ifndef android_hardware_vehicle_V2_0_VehicleObjectPool_H_
 #define android_hardware_vehicle_V2_0_VehicleObjectPool_H_
 
+#include "VehicleUtils.h" // defines LOG_TAG and includes <android/log.h>
+
 #include <iostream>
 #include <memory>
 #include <deque>
@@ -24,10 +27,12 @@
 #include <map>
 #include <mutex>
 
+#ifndef LOG_TAG
+#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#endif
+#include <android/log.h>
 #include <android/hardware/vehicle/2.0/types.h>
 
-#include "VehicleUtils.h"
-
 namespace android {
 namespace hardware {
 namespace vehicle {

vehicle/2.0/default/vehicle_hal_manager/VehicleUtils.h

@@ -17,6 +17,11 @@
 #ifndef android_hardware_vehicle_V2_0_VehicleUtils_H_
 #define android_hardware_vehicle_V2_0_VehicleUtils_H_
 
+#ifndef LOG_TAG
+#define LOG_TAG "android.hardware.vehicle@2.0-impl"
+#endif
+#include <android/log.h>
+
 #include <memory>
 
 #include <hidl/HidlSupport.h>

vibrator/1.0/default/Vibrator.cpp

@@ -15,9 +15,9 @@
  */
 
 #define LOG_TAG "VibratorService"
-
 #include <hardware/hardware.h>
 #include <hardware/vibrator.h>
+#include <android/log.h>
 #include "Vibrator.h"
 
 namespace android {

vibrator/1.0/vts/functional/Android.bp

@@ -19,6 +19,7 @@ cc_test {
     gtest: true,
     srcs: ["vibrator_hidl_hal_test.cpp"],
     shared_libs: [
+        "libbase",
         "liblog",
         "libutils",
         "android.hardware.vibrator@1.0",

vibrator/1.0/vts/functional/vibrator_hidl_hal_test.cpp

@@ -62,6 +62,6 @@ int main(int argc, char **argv) {
   ::testing::AddGlobalTestEnvironment(new VibratorHidlEnvironment);
   ::testing::InitGoogleTest(&argc, argv);
   int status = RUN_ALL_TESTS();
-  ALOGI("Test result = %d", status);
+  LOG(INFO) << "Test result = " << status;
   return status;
 }

vr/1.0/default/Vr.cpp

@@ -18,6 +18,7 @@
 
 #include <hardware/hardware.h>
 #include <hardware/vr.h>
+#include <android/log.h>
 #include "Vr.h"
 
 namespace android {