From 2d53b8173e051a00aa8f2a9018c8d544786975f8 Mon Sep 17 00:00:00 2001
From: Fredia Huya-Kouadio <fhuyakou@gmail.com>
Date: Sat, 27 Jun 2020 16:40:22 -0700
Subject: [PATCH] Fix the logic to enable focus awareness

---
 platform/android/export/export.cpp            | 6 ++++--
 platform/android/java/app/AndroidManifest.xml | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index a663a847c27..2f6f483edf5 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -862,6 +862,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 					String tname = string_table[name];
 					uint32_t attrcount = decode_uint32(&p_manifest[iofs + 20]);
 					iofs += 28;
+					bool is_focus_aware_metadata = false;
 
 					for (uint32_t i = 0; i < attrcount; i++) {
 						uint32_t attr_nspace = decode_uint32(&p_manifest[iofs]);
@@ -929,9 +930,9 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 							}
 						}
 
-						if (tname == "meta-data" && attrname == "value" && value == "oculus_focus_aware_value") {
+						if (tname == "meta-data" && attrname == "value" && is_focus_aware_metadata) {
 							// Update the focus awareness meta-data value
-							string_table.write[attr_value] = xr_mode_index == /* XRMode.OVR */ 1 && focus_awareness ? "true" : "false";
+							encode_uint32(xr_mode_index == /* XRMode.OVR */ 1 && focus_awareness ? 0xFFFFFFFF : 0, &p_manifest.write[iofs + 16]);
 						}
 
 						if (tname == "meta-data" && attrname == "value" && value == "plugins_value" && !plugins_names.empty()) {
@@ -939,6 +940,7 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
 							string_table.write[attr_value] = plugins_names;
 						}
 
+						is_focus_aware_metadata = tname == "meta-data" && attrname == "name" && value == "com.oculus.vr.focusaware";
 						iofs += 20;
 					}
 
diff --git a/platform/android/java/app/AndroidManifest.xml b/platform/android/java/app/AndroidManifest.xml
index dbf1dc0f3c6..48c09552c1a 100644
--- a/platform/android/java/app/AndroidManifest.xml
+++ b/platform/android/java/app/AndroidManifest.xml
@@ -45,8 +45,8 @@
             android:resizeableActivity="false"
             tools:ignore="UnusedAttribute" >
 
-            <!-- Focus awareness metadata populated at export time if the user enables it in the 'Xr Features' section. -->
-            <meta-data android:name="com.oculus.vr.focusaware" android:value="oculus_focus_aware_value" />
+            <!-- Focus awareness metadata is updated at export time if the user enables it in the 'Xr Features' section. -->
+            <meta-data android:name="com.oculus.vr.focusaware" android:value="false" />
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />