From 31d2d19d853a4deb5b763f6d7f15042717cb1ff2 Mon Sep 17 00:00:00 2001
From: Nikita Samoylov <30437684+MasterBin@users.noreply.github.com>
Date: Sat, 16 Jan 2021 03:42:51 +0300
Subject: [PATCH] fix: activity added to manifest, state saving fix (#416)

---
 ApiDemos/kotlin/app/src/gms/AndroidManifest.xml               | 1 +
 .../java/com/example/kotlindemos/RawMapViewDemoActivity.kt    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml b/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
index c709014c..35caaa84 100644
--- a/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
+++ b/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
@@ -56,6 +56,7 @@
         <activity android:name=".UiSettingsDemoActivity" />
         <activity android:name=".VisibleRegionDemoActivity"/>
         <activity android:name=".polyline.PolylineDemoActivity" />
+        <activity android:name=".RawMapViewDemoActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt
index f15075f2..3bc14ffd 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/RawMapViewDemoActivity.kt
@@ -43,8 +43,8 @@ class RawMapViewDemoActivity : AppCompatActivity(), OnMapReadyCallback {
 
   override fun onSaveInstanceState(outState: Bundle) {
     super.onSaveInstanceState(outState)
-    val mapViewBundle = outState.getBundle(MAPVIEW_BUNDLE_KEY) ?: Bundle().apply {
-      putBundle(MAPVIEW_BUNDLE_KEY, this)
+    val mapViewBundle = outState.getBundle(MAPVIEW_BUNDLE_KEY) ?: Bundle().also {
+      outState.putBundle(MAPVIEW_BUNDLE_KEY, it)
     }
     mapView.onSaveInstanceState(mapViewBundle)
   }