Merge "composer: Prevents TUI Transition state change in case of End/Unprepare"
diff --git a/composer/hwc_display.cpp b/composer/hwc_display.cpp
index b992a04..8b3c97c 100755
--- a/composer/hwc_display.cpp
+++ b/composer/hwc_display.cpp
@@ -3151,6 +3151,9 @@
 DisplayError HWCDisplay::PostHandleSecureEvent(SecureEvent secure_event) {
   DisplayError err = display_intf_->PostHandleSecureEvent(secure_event);
   if (err == kErrorNone) {
+    if (secure_event == kTUITransitionEnd || secure_event == kTUITransitionUnPrepare) {
+      return kErrorNone;
+    }
     secure_event_ = secure_event;
   }
   return err;