Nabi and Prevent issue fix

Change-Id: Idc22abedea584834b7e7fae66c7b16780765321c

diff --git a/inc/CmCameraApp.h b/inc/CmCameraApp.h
index e96b80e..02df094 100644 (file)
--- a/inc/CmCameraApp.h
+++ b/inc/CmCameraApp.h
@@ -72,6 +72,7 @@ public:
        virtual void OnBatteryLevelChanged(Tizen::System::BatteryLevel batteryLevel);
 
        virtual void OnChargingStateChanged(bool charging);
+       virtual void    OnLowMemory (void);
 
 private:
        void OnRequestAppControlTest(void);

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 9ccf56d..be57ef5 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -7534,6 +7534,11 @@ CamcorderForm::RotationImageN(Bitmap* pSrcBitmap, ImageRotationType rotationType
 
 CATCH:
        AppLogDebug("Image rotation process fail[%s]", GetErrorMessage(r));
+       if(pBitmap != null)                             //Prevent issue fix.\r
+       {\r
+               delete pBitmap;\r
+       }\r
+\r
        if (pSrcByteBuff != null)
        {
                delete pSrcByteBuff;
@@ -10956,20 +10961,10 @@ CamcorderForm::ShowUnlaunchPopup(void)
        TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%d]", GetErrorMessage(r));
        msgBox.ShowAndWait(modalResult);
 
-       switch (modalResult)
-       {
-       case MSGBOX_RESULT_CLOSE:
-               {
-                       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
 
-                       r = TerminateApp();
-                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-               }
-               break;
-
-       default:
-               break;
-       }
+       r = TerminateApp();
+       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 

diff --git a/src/CmCameraApp.cpp b/src/CmCameraApp.cpp
index 313ce23..b2bf818 100644 (file)
--- a/src/CmCameraApp.cpp
+++ b/src/CmCameraApp.cpp
@@ -491,4 +491,10 @@ CameraApp::OnRequestAppControl(void)
                        return E_SUCCESS;
                }
        }
-}
\ No newline at end of file
+}
+void
+CameraApp::OnLowMemory (void)
+{
+       AppLogDebug("Enter");
+       AppLogDebug("Exit");
+}

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index a513229..6160bee 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -6843,6 +6843,10 @@ CATCH:
                pSrcByteBuff = null;
        }
 
+       if (pBitmap != null)                    //Prevent issue fix.\r
+       {\r
+               delete pBitmap;\r
+       }\r
        return null;
 }
 
@@ -10200,20 +10204,11 @@ CameraForm::ShowUnlaunchPopup(void)
        TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
        msgBox.ShowAndWait(modalResult);
 
-       switch (modalResult)
-       {
-       case MSGBOX_RESULT_CLOSE:
-               {
-                       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+       AppLogDebug("RAKESH : Terminate App");
+       r = TerminateApp();
+       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
 
-                       r = TerminateApp();
-                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-               }
-               break;
-
-       default:
-               break;
-       }
        AppLogDebug("EXIT");
 }
 

diff --git a/src/CmCameraPresentationModel.cpp b/src/CmCameraPresentationModel.cpp
index 265f1bb..b4f843d 100644 (file)
--- a/src/CmCameraPresentationModel.cpp
+++ b/src/CmCameraPresentationModel.cpp
@@ -879,6 +879,7 @@ CameraPresentationModel::InitializeFlashMode(void)
        int flashMode = 0;
        int selfPortraitEnable = 0;
 
+       r = GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        if (selfPortraitEnable == CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
                r = GetMediaCapability(CAMERA_PRIMARY_FLASH_MODE);
@@ -3058,6 +3059,8 @@ CameraPresentationModel::ResetCameraSettings(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
+       TryCatch(__pCameraSettingsPresentationModel!=null, r = E_FAILURE,"Camera Settings Presentation Model is NULL");
+
        r = __pCameraSettingsPresentationModel->SetValue(SECTION_CAMERA, EXPOSURE_VALUE, EXPOSURE_DEFAULT_VALUE);
        TryCatch(r == E_SUCCESS, , "Registry::GetValue() failed[%s]", GetErrorMessage(r));
 

diff --git a/src/CmCameraSettingsPresentationModel.cpp b/src/CmCameraSettingsPresentationModel.cpp
index 38f10b3..1b57e7c 100644 (file)
--- a/src/CmCameraSettingsPresentationModel.cpp
+++ b/src/CmCameraSettingsPresentationModel.cpp
@@ -162,6 +162,7 @@ CameraSettingsPresentationModel::SetValue(const Tizen::Base::String& strSectionN
        result r = E_SUCCESS;
 
        AppLogDebug("SetValue set value to registry");
+       TryCatch(__pAppCameraRegistry!=null, r= E_FAILURE, "Camera App Registry is NULL");
 
        r = __pAppCameraRegistry->SetValue(strSectionName, entryName, value);
 
@@ -179,6 +180,7 @@ CameraSettingsPresentationModel::SetValue(const Tizen::Base::String& strSectionN
        return r;
 
 CATCH:
+       AppLogDebug("EXIT : Error Code : %s", GetErrorMessage(r));
        return r;
 }