[android] Fixed issue with missing "Clear" button in search view. Fixed missing map invalidates when clearing search view.

1 files changed, 7 insertions, 4 deletions

diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 6351735df0..a398d0cd51 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -451,10 +451,13 @@ namespace android
 
   void Framework::CleanSearchLayerOnMap()
   {
-    NativeFramework()->GetBalloonManager().RemovePin();
-    NativeFramework()->GetBalloonManager().Dismiss();
-    NativeFramework()->GetBookmarkManager().AdditionalPoiLayerClear();
-    NativeFramework()->Invalidate();
+    ::Framework * f = NativeFramework();
+
+    // Call ClearXXX first, then RemovePin (Framework::Invalidate is called inside).
+    f->GetBookmarkManager().AdditionalPoiLayerClear();
+    f->GetBalloonManager().RemovePin();
+    f->GetBalloonManager().Dismiss();
+    f->Invalidate();
   }
 
   bool Framework::Search(search::SearchParams const & params)