From 22f5a971e82bc1dc229f34ffa93be9fe0dec9053 Mon Sep 17 00:00:00 2001 From: Ziyan Date: Fri, 6 Nov 2015 19:59:03 +0100 Subject: camera: fix build for recent 6.0 releases Frameworks/native commit e2806cb4456e3815e979f333ed23ec7df591a9ff made SensorManager(const android::String16&) private. Let's use SensorManager& getInstanceForPackage(const String16& packageName) instead. --- camera/SensorListener.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/camera/SensorListener.cpp b/camera/SensorListener.cpp index 3f288fd..dde4481 100644 --- a/camera/SensorListener.cpp +++ b/camera/SensorListener.cpp @@ -131,7 +131,7 @@ SensorListener::~SensorListener() { status_t SensorListener::initialize() { status_t ret = NO_ERROR; #ifdef ANDROID_API_MM_OR_LATER - android::SensorManager mgr(android::String16("TI OMAP CameraHal Module")); + android::SensorManager& mgr(android::SensorManager::getInstanceForPackage(android::String16("TI OMAP CameraHal Module"))); #else android::SensorManager& mgr(android::SensorManager::getInstance()); #endif @@ -198,7 +198,7 @@ void SensorListener::handleOrientation(uint32_t orientation, uint32_t tilt) { void SensorListener::enableSensor(sensor_type_t type) { android::Sensor const* sensor; #ifdef ANDROID_API_MM_OR_LATER - android::SensorManager mgr(android::String16("TI OMAP CameraHal Module")); + android::SensorManager& mgr(android::SensorManager::getInstanceForPackage(android::String16("TI OMAP CameraHal Module"))); #else android::SensorManager& mgr(android::SensorManager::getInstance()); #endif @@ -225,7 +225,7 @@ void SensorListener::enableSensor(sensor_type_t type) { void SensorListener::disableSensor(sensor_type_t type) { android::Sensor const* sensor; #ifdef ANDROID_API_MM_OR_LATER - android::SensorManager mgr(android::String16("TI OMAP CameraHal Module")); + android::SensorManager& mgr(android::SensorManager::getInstanceForPackage(android::String16("TI OMAP CameraHal Module"))); #else android::SensorManager& mgr(android::SensorManager::getInstance()); #endif -- cgit v1.1