From 5f61812b7ff93318b201a440bc7cacc82cd69a00 Mon Sep 17 00:00:00 2001
From: David Oliver <david.oliver@nventive.com>
Date: Thu, 23 May 2019 14:48:21 -0400
Subject: [PATCH] [Android] Add missing conditionals

---
 .../CalcManager/CalculatorManager.Interop.cs                  | 4 ++--
 .../ViewModels/StandardCalculatorViewModel.cs                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs
index 90de0552..f636b9cd 100644
--- a/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs
+++ b/src/Calculator.Shared/CalcManager/CalculatorManager.Interop.cs
@@ -306,7 +306,7 @@ namespace CalculationManager
 
 		internal static IntPtr StringToHGlobal(string resourceValue)
 		{
-#if __WASM__ || __IOS__
+#if __WASM__ || __IOS__ || __ANDROID__
 			// wchar_t is 32bits
 			return StringToHGlobalUTF32(resourceValue);
 #else
@@ -316,7 +316,7 @@ namespace CalculationManager
 
 		internal static string PtrToString(IntPtr pResourceId)
 		{
-#if __WASM__ || __IOS__
+#if __WASM__ || __IOS__ || __ANDROID__
 			return PtrToStringUTF32(pResourceId);
 #else
 			return Marshal.PtrToStringUni(pResourceId);
diff --git a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
index 18d93169..abe58f16 100644
--- a/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
+++ b/src/Calculator.Shared/ViewModels/StandardCalculatorViewModel.cs
@@ -574,7 +574,7 @@ namespace CalculatorApp.ViewModel
 
             m_decimalSeparator = LocalizationSettings.GetInstance().GetDecimalSeparator();
 
-#if !__WASM__ && !__IOS__
+#if !__WASM__ && !__IOS__ && !__ANDROID__
 			if (CoreWindow.GetForCurrentThread() != null)
             {
                 // Must have a CoreWindow to access the resource context.