@ -326,8 +326,11 @@ status_t CameraProviderManager::setTorchMode(const std::string &id, bool enabled
// Pass the camera ID to start interface so that it will save it to the map of ICameraProviders
// Pass the camera ID to start interface so that it will save it to the map of ICameraProviders
// that are currently in use.
// that are currently in use.
const sp < provider : : V2_4 : : ICameraProvider > interface =
sp < ProviderInfo > parentProvider = deviceInfo - > mParentProvider . promote ( ) ;
deviceInfo - > mParentProvider - > startProviderInterface ( ) ;
if ( parentProvider = = nullptr ) {
return DEAD_OBJECT ;
}
const sp < provider : : V2_4 : : ICameraProvider > interface = parentProvider - > startProviderInterface ( ) ;
if ( interface = = nullptr ) {
if ( interface = = nullptr ) {
return DEAD_OBJECT ;
return DEAD_OBJECT ;
}
}
@ -380,8 +383,11 @@ status_t CameraProviderManager::openSession(const std::string &id,
if ( deviceInfo = = nullptr ) return NAME_NOT_FOUND ;
if ( deviceInfo = = nullptr ) return NAME_NOT_FOUND ;
auto * deviceInfo3 = static_cast < ProviderInfo : : DeviceInfo3 * > ( deviceInfo ) ;
auto * deviceInfo3 = static_cast < ProviderInfo : : DeviceInfo3 * > ( deviceInfo ) ;
const sp < provider : : V2_4 : : ICameraProvider > provider =
sp < ProviderInfo > parentProvider = deviceInfo - > mParentProvider . promote ( ) ;
deviceInfo - > mParentProvider - > startProviderInterface ( ) ;
if ( parentProvider = = nullptr ) {
return DEAD_OBJECT ;
}
const sp < provider : : V2_4 : : ICameraProvider > provider = parentProvider - > startProviderInterface ( ) ;
if ( provider = = nullptr ) {
if ( provider = = nullptr ) {
return DEAD_OBJECT ;
return DEAD_OBJECT ;
}
}
@ -423,8 +429,11 @@ status_t CameraProviderManager::openSession(const std::string &id,
if ( deviceInfo = = nullptr ) return NAME_NOT_FOUND ;
if ( deviceInfo = = nullptr ) return NAME_NOT_FOUND ;
auto * deviceInfo1 = static_cast < ProviderInfo : : DeviceInfo1 * > ( deviceInfo ) ;
auto * deviceInfo1 = static_cast < ProviderInfo : : DeviceInfo1 * > ( deviceInfo ) ;
const sp < provider : : V2_4 : : ICameraProvider > provider =
sp < ProviderInfo > parentProvider = deviceInfo - > mParentProvider . promote ( ) ;
deviceInfo - > mParentProvider - > startProviderInterface ( ) ;
if ( parentProvider = = nullptr ) {
return DEAD_OBJECT ;
}
const sp < provider : : V2_4 : : ICameraProvider > provider = parentProvider - > startProviderInterface ( ) ;
if ( provider = = nullptr ) {
if ( provider = = nullptr ) {
return DEAD_OBJECT ;
return DEAD_OBJECT ;
}
}
@ -2044,7 +2053,10 @@ sp<InterfaceT> CameraProviderManager::ProviderInfo::DeviceInfo::startDeviceInter
sp < InterfaceT > device ;
sp < InterfaceT > device ;
ATRACE_CALL ( ) ;
ATRACE_CALL ( ) ;
if ( mSavedInterface = = nullptr ) {
if ( mSavedInterface = = nullptr ) {
device = mParentProvider - > startDeviceInterface < InterfaceT > ( mName ) ;
sp < ProviderInfo > parentProvider = mParentProvider . promote ( ) ;
if ( parentProvider ! = nullptr ) {
device = parentProvider - > startDeviceInterface < InterfaceT > ( mName ) ;
}
} else {
} else {
device = ( InterfaceT * ) mSavedInterface . get ( ) ;
device = ( InterfaceT * ) mSavedInterface . get ( ) ;
}
}