From 02cbb36ebe39405865966bbec61322ebaf99a1b0 Mon Sep 17 00:00:00 2001
From: Mihail Marinov <m.marinov@samsung.com>
Date: Mon, 9 Nov 2015 13:51:02 -0800
Subject: [PATCH] Mark all samples's activities "singleTask" to prevent a crash

If you hit back and hit back again to return to the app there is a
crash since the move to 1.0.0.0. Oculus requires singleTask
activity.

Oculus apps crash the same way if singleTask is taken out from
their manifest.
---
 GVRf/Sample/collision/AndroidManifest.xml                      | 1 +
 GVRf/Sample/eye-picking/AndroidManifest.xml                    | 1 +
 GVRf/Sample/gamepad/AndroidManifest.xml                        | 1 +
 GVRf/Sample/gvr-cubemap/AndroidManifest.xml                    | 1 +
 GVRf/Sample/gvr-litshader/AndroidManifest.xml                  | 1 +
 GVRf/Sample/gvr-outlinesample/AndroidManifest.xml              | 1 +
 GVRf/Sample/gvr-pickandmove/AndroidManifest.xml                | 1 +
 GVRf/Sample/gvr-sample/AndroidManifest.xml                     | 1 +
 GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml    | 1 +
 GVRf/Sample/gvr-testcube/AndroidManifest.xml                   | 1 +
 GVRf/Sample/gvr-video/AndroidManifest.xml                      | 1 +
 GVRf/Sample/gvr-vuforia/AndroidManifest.xml                    | 1 +
 GVRf/Sample/gvrbulletsample/AndroidManifest.xml                | 1 +
 GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml              | 1 +
 GVRf/Sample/gvrexposeapisample/AndroidManifest.xml             | 1 +
 GVRf/Sample/gvrf_controls_sample/AndroidManifest.xml           | 3 ++-
 GVRf/Sample/gvrf_immersivepedia/AndroidManifest.xml            | 3 ++-
 GVRf/Sample/gvrf_keyboard_sample/AndroidManifest.xml           | 3 ++-
 GVRf/Sample/gvrjassimpmodelloader/AndroidManifest.xml          | 1 +
 GVRf/Sample/gvropacityanigallery/AndroidManifest.xml           | 1 +
 .../gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml   | 1 +
 GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml      | 1 +
 GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml    | 1 +
 GVRf/Sample/gvrtextviewsample/AndroidManifest.xml              | 1 +
 GVRf/Sample/lod-test/AndroidManifest.xml                       | 1 +
 GVRf/Sample/model-viewer/AndroidManifest.xml                   | 1 +
 GVRf/Sample/nonglthreadupdate/AndroidManifest.xml              | 1 +
 GVRf/Sample/scene-objects/AndroidManifest.xml                  | 1 +
 GVRf/Sample/simple-gallery/AndroidManifest.xml                 | 1 +
 GVRf/Sample/simple-sample/AndroidManifest.xml                  | 1 +
 GVRf/Sample/solar-system/AndroidManifest.xml                   | 1 +
 GVRf/Sample/transparency-test/AndroidManifest.xml              | 1 +
 32 files changed, 35 insertions(+), 3 deletions(-)
 mode change 100755 => 100644 GVRf/Sample/eye-picking/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-cubemap/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-litshader/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-sample/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-testcube/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-video/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvr-vuforia/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvrexposeapisample/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvropacityanigallery/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/model-viewer/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/simple-gallery/AndroidManifest.xml
 mode change 100755 => 100644 GVRf/Sample/solar-system/AndroidManifest.xml

diff --git a/GVRf/Sample/collision/AndroidManifest.xml b/GVRf/Sample/collision/AndroidManifest.xml
index c3c74dbc7..07ff9c7f3 100644
--- a/GVRf/Sample/collision/AndroidManifest.xml
+++ b/GVRf/Sample/collision/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity
             android:name="org.gearvrf.collisiondetection.CollisionActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/eye-picking/AndroidManifest.xml b/GVRf/Sample/eye-picking/AndroidManifest.xml
old mode 100755
new mode 100644
index 02466b0b5..d9d82db33
--- a/GVRf/Sample/eye-picking/AndroidManifest.xml
+++ b/GVRf/Sample/eye-picking/AndroidManifest.xml
@@ -37,6 +37,7 @@
         <activity
             android:name="org.gearvrf.eyepickingsample.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gamepad/AndroidManifest.xml b/GVRf/Sample/gamepad/AndroidManifest.xml
index 6c1a1c29a..71bffdf0e 100644
--- a/GVRf/Sample/gamepad/AndroidManifest.xml
+++ b/GVRf/Sample/gamepad/AndroidManifest.xml
@@ -21,6 +21,7 @@
         <activity
             android:name="org.gearvrf.gamepad.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-cubemap/AndroidManifest.xml b/GVRf/Sample/gvr-cubemap/AndroidManifest.xml
old mode 100755
new mode 100644
index 9b642aa36..643a22dd8
--- a/GVRf/Sample/gvr-cubemap/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-cubemap/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity
             android:name="org.gearvrf.cubemap.CubemapActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-litshader/AndroidManifest.xml b/GVRf/Sample/gvr-litshader/AndroidManifest.xml
old mode 100755
new mode 100644
index 6aa34552b..b7f3317f9
--- a/GVRf/Sample/gvr-litshader/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-litshader/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <activity
             android:name="org.gearvrf.litshader.LitshaderActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-outlinesample/AndroidManifest.xml b/GVRf/Sample/gvr-outlinesample/AndroidManifest.xml
index bf68c9932..735a5cd9a 100644
--- a/GVRf/Sample/gvr-outlinesample/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-outlinesample/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <activity
             android:name="org.gearvrf.gvroutlinesample.OutlineActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-pickandmove/AndroidManifest.xml b/GVRf/Sample/gvr-pickandmove/AndroidManifest.xml
index 5747a515f..30fce8c4e 100644
--- a/GVRf/Sample/gvr-pickandmove/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-pickandmove/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity
             android:name="org.gearvrf.pickandmove.PickandmoveActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-sample/AndroidManifest.xml b/GVRf/Sample/gvr-sample/AndroidManifest.xml
old mode 100755
new mode 100644
index c732cebda..67b5385f9
--- a/GVRf/Sample/gvr-sample/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-sample/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity
             android:name="org.gearvrf.sample.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml b/GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml
old mode 100755
new mode 100644
index 14106ade7..ce14aedd5
--- a/GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-test-screenshot3Dresult/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity
             android:name="org.gearvrf.testscreenshot3Dresult.TestScreenshot3DResultActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-testcube/AndroidManifest.xml b/GVRf/Sample/gvr-testcube/AndroidManifest.xml
old mode 100755
new mode 100644
index d31031814..9336f7e20
--- a/GVRf/Sample/gvr-testcube/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-testcube/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity
             android:name="org.gearvrf.testcube.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-video/AndroidManifest.xml b/GVRf/Sample/gvr-video/AndroidManifest.xml
old mode 100755
new mode 100644
index 6a285a01b..ba51fc56d
--- a/GVRf/Sample/gvr-video/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-video/AndroidManifest.xml
@@ -39,6 +39,7 @@
         <activity
             android:name="org.gearvrf.video.VideoActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvr-vuforia/AndroidManifest.xml b/GVRf/Sample/gvr-vuforia/AndroidManifest.xml
old mode 100755
new mode 100644
index 0de4a6bc4..a0a6b1464
--- a/GVRf/Sample/gvr-vuforia/AndroidManifest.xml
+++ b/GVRf/Sample/gvr-vuforia/AndroidManifest.xml
@@ -43,6 +43,7 @@
         <activity
             android:name="org.gearvrf.vuforiasample.VuforiaSampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrbulletsample/AndroidManifest.xml b/GVRf/Sample/gvrbulletsample/AndroidManifest.xml
index 458907cb9..75300c4c2 100644
--- a/GVRf/Sample/gvrbulletsample/AndroidManifest.xml
+++ b/GVRf/Sample/gvrbulletsample/AndroidManifest.xml
@@ -35,6 +35,7 @@
         <activity
             android:name="org.gearvrf.bulletsample.BulletSampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml b/GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml
old mode 100755
new mode 100644
index 25b33a3ee..90b6b1dca
--- a/GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml
+++ b/GVRf/Sample/gvrcockpit_v1_5_0/AndroidManifest.xml
@@ -38,6 +38,7 @@
             android:name="org.gearvrf.cockpit.CockpitActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrexposeapisample/AndroidManifest.xml b/GVRf/Sample/gvrexposeapisample/AndroidManifest.xml
old mode 100755
new mode 100644
index b7e196a3c..1c068d92a
--- a/GVRf/Sample/gvrexposeapisample/AndroidManifest.xml
+++ b/GVRf/Sample/gvrexposeapisample/AndroidManifest.xml
@@ -40,6 +40,7 @@
         <activity
             android:name="org.gearvrf.gvrexposeapisample.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrf_controls_sample/AndroidManifest.xml b/GVRf/Sample/gvrf_controls_sample/AndroidManifest.xml
index b6a9f9e2a..40cfdc099 100644
--- a/GVRf/Sample/gvrf_controls_sample/AndroidManifest.xml
+++ b/GVRf/Sample/gvrf_controls_sample/AndroidManifest.xml
@@ -37,7 +37,8 @@
         <activity
             android:name="org.gearvrf.controls.MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" >
+            android:screenOrientation="landscape"
+            android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/GVRf/Sample/gvrf_immersivepedia/AndroidManifest.xml b/GVRf/Sample/gvrf_immersivepedia/AndroidManifest.xml
index 25485a9e6..60be12f77 100644
--- a/GVRf/Sample/gvrf_immersivepedia/AndroidManifest.xml
+++ b/GVRf/Sample/gvrf_immersivepedia/AndroidManifest.xml
@@ -25,7 +25,8 @@
         <activity
             android:name="org.gearvrf.immersivepedia.MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" >
+            android:screenOrientation="landscape"
+            android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/GVRf/Sample/gvrf_keyboard_sample/AndroidManifest.xml b/GVRf/Sample/gvrf_keyboard_sample/AndroidManifest.xml
index a745be460..bcdcafda2 100644
--- a/GVRf/Sample/gvrf_keyboard_sample/AndroidManifest.xml
+++ b/GVRf/Sample/gvrf_keyboard_sample/AndroidManifest.xml
@@ -22,7 +22,8 @@
         <activity
             android:name="org.gearvrf.keyboard.main.MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" >
+            android:screenOrientation="landscape"
+            android:launchMode="singleTask" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/GVRf/Sample/gvrjassimpmodelloader/AndroidManifest.xml b/GVRf/Sample/gvrjassimpmodelloader/AndroidManifest.xml
index ff36069af..b07e4b91b 100644
--- a/GVRf/Sample/gvrjassimpmodelloader/AndroidManifest.xml
+++ b/GVRf/Sample/gvrjassimpmodelloader/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity
             android:name="org.gearvrf.jassimpmodelloader.JassimpModelLoaderActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvropacityanigallery/AndroidManifest.xml b/GVRf/Sample/gvropacityanigallery/AndroidManifest.xml
old mode 100755
new mode 100644
index 672601ac3..37fde4f04
--- a/GVRf/Sample/gvropacityanigallery/AndroidManifest.xml
+++ b/GVRf/Sample/gvropacityanigallery/AndroidManifest.xml
@@ -36,6 +36,7 @@
         <activity
             android:name="org.gearvrf.opacityanigallery.GalleryActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml b/GVRf/Sample/gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml
old mode 100755
new mode 100644
index d49c92762..eccf2e0df
--- a/GVRf/Sample/gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml
+++ b/GVRf/Sample/gvrpanoramasstereoimagesample_v1_5_0/AndroidManifest.xml
@@ -38,6 +38,7 @@
             android:name="org.gearvrf.panoramasstereoimagesample.SampleActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml b/GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml
old mode 100755
new mode 100644
index 7a6a4b41b..d5fb03146
--- a/GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml
+++ b/GVRf/Sample/gvrperformancetest_v1_5_0/AndroidManifest.xml
@@ -38,6 +38,7 @@
             android:name="org.gearvrf.performancetest.TestActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml b/GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml
old mode 100755
new mode 100644
index 17ed1cbe4..be721c1be
--- a/GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml
+++ b/GVRf/Sample/gvrsixaxissensortest_v1_5_0/AndroidManifest.xml
@@ -37,6 +37,7 @@
             android:name="org.gearvrf.sixaxissensortest.TestActivity"
             android:label="@string/app_name"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/gvrtextviewsample/AndroidManifest.xml b/GVRf/Sample/gvrtextviewsample/AndroidManifest.xml
index 8b103dcbf..db02fb6ae 100644
--- a/GVRf/Sample/gvrtextviewsample/AndroidManifest.xml
+++ b/GVRf/Sample/gvrtextviewsample/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <activity
             android:name="org.gearvrf.gvrtextviewsample.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/lod-test/AndroidManifest.xml b/GVRf/Sample/lod-test/AndroidManifest.xml
index 333e9f4fd..610e3dcbe 100644
--- a/GVRf/Sample/lod-test/AndroidManifest.xml
+++ b/GVRf/Sample/lod-test/AndroidManifest.xml
@@ -15,6 +15,7 @@
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name="LODTestActivity"
                   android:screenOrientation="landscape"
+                  android:launchMode="singleTask"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/model-viewer/AndroidManifest.xml b/GVRf/Sample/model-viewer/AndroidManifest.xml
old mode 100755
new mode 100644
index 87869b271..c13d0bf39
--- a/GVRf/Sample/model-viewer/AndroidManifest.xml
+++ b/GVRf/Sample/model-viewer/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity
             android:name="org.gearvrf.modelviewer.ViewerActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/nonglthreadupdate/AndroidManifest.xml b/GVRf/Sample/nonglthreadupdate/AndroidManifest.xml
index 3f451ff20..c4e60c763 100644
--- a/GVRf/Sample/nonglthreadupdate/AndroidManifest.xml
+++ b/GVRf/Sample/nonglthreadupdate/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <activity
             android:name="org.gearvrf.nonglthreadupdate.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/scene-objects/AndroidManifest.xml b/GVRf/Sample/scene-objects/AndroidManifest.xml
index ea84a4491..58a1104a7 100644
--- a/GVRf/Sample/scene-objects/AndroidManifest.xml
+++ b/GVRf/Sample/scene-objects/AndroidManifest.xml
@@ -33,6 +33,7 @@
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name="SceneObjectActivity"
                   android:screenOrientation="landscape"
+                  android:launchMode="singleTask"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/simple-gallery/AndroidManifest.xml b/GVRf/Sample/simple-gallery/AndroidManifest.xml
old mode 100755
new mode 100644
index 00899e666..e26356e65
--- a/GVRf/Sample/simple-gallery/AndroidManifest.xml
+++ b/GVRf/Sample/simple-gallery/AndroidManifest.xml
@@ -38,6 +38,7 @@
         <activity
             android:name="org.gearvrf.simplegallery.GalleryActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/simple-sample/AndroidManifest.xml b/GVRf/Sample/simple-sample/AndroidManifest.xml
index a32db8c7a..eafc62460 100644
--- a/GVRf/Sample/simple-sample/AndroidManifest.xml
+++ b/GVRf/Sample/simple-sample/AndroidManifest.xml
@@ -34,6 +34,7 @@
         <activity
             android:name="org.gearvrf.simplesample.SampleActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/solar-system/AndroidManifest.xml b/GVRf/Sample/solar-system/AndroidManifest.xml
old mode 100755
new mode 100644
index a0cb9e219..e08cc2fc2
--- a/GVRf/Sample/solar-system/AndroidManifest.xml
+++ b/GVRf/Sample/solar-system/AndroidManifest.xml
@@ -36,6 +36,7 @@
         <activity
             android:name="org.gearvrf.solarsystem.SolarActivity"
             android:screenOrientation="landscape"
+            android:launchMode="singleTask"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/GVRf/Sample/transparency-test/AndroidManifest.xml b/GVRf/Sample/transparency-test/AndroidManifest.xml
index b78a6f67d..228a025b7 100644
--- a/GVRf/Sample/transparency-test/AndroidManifest.xml
+++ b/GVRf/Sample/transparency-test/AndroidManifest.xml
@@ -18,6 +18,7 @@
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name="TransparencyTest"
                   android:screenOrientation="landscape"
+                  android:launchMode="singleTask"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />