[PLM130604-7551] Service app crash issue

Change-Id: I6a4837947408bef438ef8bf11bb773bb82bda5bd
Signed-off-by: Bumseung Cho <bumseung.cho@samsung.com>

diff --git a/src/ui/FUi_AccessibilityManager.cpp b/src/ui/FUi_AccessibilityManager.cpp
index 28fdcf9..a1896d2 100644 (file)
--- a/src/ui/FUi_AccessibilityManager.cpp
+++ b/src/ui/FUi_AccessibilityManager.cpp
@@ -109,13 +109,15 @@ public:
        virtual ~AutoReadingTimer(void) {}
        void Start(Tizen::Ui::_AccessibilityAutoReadingMode mode)
        {
-               SysLog(NID_UI, "AccessibilityManager::AutoReadingTimer is requested mode : %d", mode);
+               if(!(Tizen::App::_AppInfo::GetAppState() & _APP_TYPE_UI_APP))
+               {
+                       return;
+               }
                if (__start)
                {
                        return;
                }
                __start = true;
-               SysLog(NID_UI, "AccessibilityManager::AutoReadingTimer is started mode : %d", mode);
                __mode = mode;
                timer.Start(700);
        }
@@ -126,13 +128,13 @@ public:
        }
        virtual void OnTimerExpired(Timer& timer)
        {
-               if (!(__pAccessibilityManager->IsScreenReaderActivated()))
+               if (!(__pAccessibilityManager->IsScreenReaderActivated()) || UiApp::GetInstance()->GetAppUiState() == APP_UI_STATE_BACKGROUND)
                {
                        return Stop();
                }
                SysLog(NID_UI, "mode %d", __mode);
-               if (UiApp::GetInstance()->GetAppUiState() == APP_UI_STATE_BACKGROUND || (__pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_READY
-                       && __pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_PLAYING))
+               if (__pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_READY
+                       && __pAccessibilityManager->GetTtsStatus() != Tizen::Ui::ACCESSIBILITY_SCREEN_READER_STATUS_PLAYING)
                {
                        __start = false;
                        Start(__mode);
@@ -1171,10 +1173,7 @@ CATCH:
 void
 _AccessibilityManager::OnFinishReading(const Tizen::Base::String& grammar)
 {
-       if (__pReadingVe)
-       {
-               __pReadingVe->SetShowState(false);
-       }
+//     HidePopup();
        if (!IsContainerValid(__pTargetContainer))
        {
                return;
@@ -1700,7 +1699,7 @@ _AccessibilityManager::RequestToDrawFocusUi()
 {
        if (__pTargetContainer)
        {
-               HidePopup();
+               //HidePopup();
                DrawFocusUi(*__pTargetElement);
        }
 }