updated merged items

StephenHodgson · StephenHodgson · commit 8e84d053174e · 2018-10-23T15:27:31.000-07:00
diff --git a/Assets/MixedRealityToolkit/_Core/Devices/VoiceInput/WindowsDictationInputDeviceManager.cs b/Assets/MixedRealityToolkit/_Core/Devices/VoiceInput/WindowsDictationInputDeviceManager.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;
 using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;
-using Microsoft.MixedReality.Toolkit.Core.Managers;
+using Microsoft.MixedReality.Toolkit.Core.Services;
 using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;
 using System.Text;
 using System.Threading.Tasks;
@@ -16,7 +16,7 @@
 namespace Microsoft.MixedReality.Toolkit.Core.Devices.VoiceInput
 {
 #if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
-    public class WindowsDictationInputDeviceManager : BaseDeviceManager, IMixedRealityDictationManager
+    public class WindowsDictationInputDeviceManager : BaseDeviceManager, IMixedRealityDictationSystem
     {
         /// <summary>
         /// Constructor.
@@ -72,13 +72,13 @@ public override void Enable()
         {
             if (!Application.isPlaying) { return; }
 
-            if (MixedRealityManager.InputSystem == null)
+            if (MixedRealityToolkit.InputSystem == null)
             {
                 Debug.LogWarning("Unable to start Windows Dictation Device Manager. An Input System is required for this feature.");
                 return;
             }
 
-            inputSource = MixedRealityManager.InputSystem.RequestNewGenericInputSource("Dictation Recognizer");
+            inputSource = MixedRealityToolkit.InputSystem.RequestNewGenericInputSource("Dictation Recognizer");
             dictationResult = string.Empty;
 
             if (dictationRecognizer == null)
@@ -95,7 +95,7 @@ public override void Enable()
         /// <inheritdoc />
         public override void Update()
         {
-            if (!Application.isPlaying || MixedRealityManager.InputSystem == null) { return; }
+            if (!Application.isPlaying || MixedRealityToolkit.InputSystem == null) { return; }
 
             if (!isTransitioning && IsListening && !Microphone.IsRecording(deviceName) && dictationRecognizer.Status == SpeechSystemStatus.Running)
             {
@@ -106,7 +106,7 @@ public override void Update()
             if (!hasFailed && dictationRecognizer.Status == SpeechSystemStatus.Failed)
             {
                 hasFailed = true;
-                MixedRealityManager.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer has failed!");
+                MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer has failed!");
             }
         }
 
@@ -141,7 +141,7 @@ public async void StartRecording(GameObject listener, float initialSilenceTimeou
         /// <inheritdoc />
         public async Task StartRecordingAsync(GameObject listener = null, float initialSilenceTimeout = 5f, float autoSilenceTimeout = 20f, int recordingTime = 10, string micDeviceName = "")
         {
-            if (IsListening || isTransitioning || MixedRealityManager.InputSystem == null || !Application.isPlaying)
+            if (IsListening || isTransitioning || MixedRealityToolkit.InputSystem == null || !Application.isPlaying)
             {
                 Debug.LogWarning("Unable to start recording");
                 return;
@@ -154,7 +154,7 @@ public async Task StartRecordingAsync(GameObject listener = null, float initialS
             if (listener != null)
             {
                 hasListener = true;
-                MixedRealityManager.InputSystem.PushModalInputHandler(listener);
+                MixedRealityToolkit.InputSystem.PushModalInputHandler(listener);
             }
 
             if (PhraseRecognitionSystem.Status == SpeechSystemStatus.Running)
@@ -179,7 +179,7 @@ public async Task StartRecordingAsync(GameObject listener = null, float initialS
 
             if (dictationRecognizer.Status == SpeechSystemStatus.Failed)
             {
-                MixedRealityManager.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer failed to start!");
+                MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer failed to start!");
                 return;
             }
 
@@ -209,7 +209,7 @@ public async Task<AudioClip> StopRecordingAsync()
 
             if (hasListener)
             {
-                MixedRealityManager.InputSystem.PopModalInputHandler();
+                MixedRealityToolkit.InputSystem.PopModalInputHandler();
                 hasListener = false;
             }
 
@@ -241,7 +241,7 @@ private void DictationRecognizer_DictationHypothesis(string text)
             // We don't want to append to textSoFar yet, because the hypothesis may have changed on the next event.
             dictationResult = $"{textSoFar} {text}...";
 
-            MixedRealityManager.InputSystem.RaiseDictationHypothesis(inputSource, dictationResult);
+            MixedRealityToolkit.InputSystem.RaiseDictationHypothesis(inputSource, dictationResult);
         }
 
         /// <summary>
@@ -255,7 +255,7 @@ private void DictationRecognizer_DictationResult(string text, ConfidenceLevel co
 
             dictationResult = textSoFar.ToString();
 
-            MixedRealityManager.InputSystem.RaiseDictationResult(inputSource, dictationResult);
+            MixedRealityToolkit.InputSystem.RaiseDictationResult(inputSource, dictationResult);
         }
 
         /// <summary>
@@ -273,7 +273,7 @@ private void DictationRecognizer_DictationComplete(DictationCompletionCause caus
                 dictationResult = "Dictation has timed out. Please try again.";
             }
 
-            MixedRealityManager.InputSystem.RaiseDictationComplete(inputSource, dictationResult, dictationAudioClip);
+            MixedRealityToolkit.InputSystem.RaiseDictationComplete(inputSource, dictationResult, dictationAudioClip);
             textSoFar = null;
             dictationResult = string.Empty;
         }
@@ -287,7 +287,7 @@ private void DictationRecognizer_DictationError(string error, int hresult)
         {
             dictationResult = $"{error}\nHRESULT: {hresult}";
 
-            MixedRealityManager.InputSystem.RaiseDictationError(inputSource, dictationResult);
+            MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, dictationResult);
             textSoFar = null;
             dictationResult = string.Empty;
         }
diff --git a/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs b/Assets/MixedRealityToolkit/_Core/Services/MixedRealityToolkit.cs
@@ -501,7 +501,7 @@ public void RegisterService(Type type, IMixedRealityService service)
                 Debug.LogWarning("Unable to add a manager of type null.");
                 return;
             }
-            if (manager == null)
+            if (service == null)
             {
                 Debug.LogWarning("Unable to add a manager with a null instance.");
                 return;
@@ -600,7 +600,7 @@ public IMixedRealityService GetService(Type type, string serviceName)
         {
             if (ActiveProfile == null)
             {
-                Debug.LogError($"Unable to get {managerName} Manager as the Mixed Reality Manager has no Active Profile.");
+                Debug.LogError($"Unable to get {serviceName} Manager as the Mixed Reality Manager has no Active Profile.");
                 return null;
             }
 
@@ -609,7 +609,7 @@ public IMixedRealityService GetService(Type type, string serviceName)
                 Debug.LogError("Unable to get null manager type.");
                 return null;
             }
-            if (string.IsNullOrEmpty(managerName))
+            if (string.IsNullOrEmpty(serviceName))
             {
                 Debug.LogError("Unable to get manager by name without the name being specified.");
                 return null;
@@ -627,7 +627,7 @@ public IMixedRealityService GetService(Type type, string serviceName)
 
             if (service == null)
             {
-                Debug.LogError($"Unable to find {managerName} Manager.");
+                Debug.LogError($"Unable to find {serviceName} Manager.");
             }
 
             return service;
@@ -676,7 +676,7 @@ public void UnregisterService(Type type, string serviceName)
         {
             if (ActiveProfile == null)
             {
-                Debug.LogError($"Unable to remove {managerName} Manager as the Mixed Reality Manager has no Active Profile.");
+                Debug.LogError($"Unable to remove {serviceName} Manager as the Mixed Reality Manager has no Active Profile.");
                 return;
             }
 
@@ -686,7 +686,7 @@ public void UnregisterService(Type type, string serviceName)
                 return;
             }
 
-            if (string.IsNullOrEmpty(managerName))
+            if (string.IsNullOrEmpty(serviceName))
             {
                 Debug.LogError("Unable to remove manager by name without the name being specified.");
                 return;
@@ -744,7 +744,7 @@ public void DisableService(Type type, string serviceName)
                 Debug.LogError("Unable to disable null manager type.");
                 return;
             }
-            if (string.IsNullOrEmpty(managerName))
+            if (string.IsNullOrEmpty(serviceName))
             {
                 Debug.LogError("Unable to disable manager by name without the name being specified.");
                 return;
@@ -800,7 +800,7 @@ public void EnableService(Type type, string serviceName)
                 Debug.LogError("Unable to enable null manager type.");
                 return;
             }
-            if (string.IsNullOrEmpty(managerName))
+            if (string.IsNullOrEmpty(serviceName))
             {
                 Debug.LogError("Unable to enable manager by name without the name being specified.");
                 return;
@@ -833,7 +833,7 @@ public List<IMixedRealityService> GetActiveServices(Type type)
             if (type == null)
             {
                 Debug.LogWarning("Unable to get managers with a type of null.");
-                return new List<IMixedRealityManager>();
+                return new List<IMixedRealityService>();
             }
 
             return GetActiveServices(type, string.Empty);
@@ -850,13 +850,13 @@ public List<IMixedRealityService> GetActiveServices(Type type, string serviceNam
             if (ActiveProfile == null)
             {
                 Debug.LogWarning($"Unable to get {nameof(type)} Manager as the Mixed Reality Manager has no Active Profile");
-                return new List<IMixedRealityManager>();
+                return new List<IMixedRealityService>();
             }
 
             if (type == null)
             {
                 Debug.LogWarning("Unable to get managers with a type of null.");
-                return new List<IMixedRealityManager>();
+                return new List<IMixedRealityService>();
             }
 
             var services = new List<IMixedRealityService>();
@@ -1040,7 +1040,7 @@ private void GetService(Type type, out IMixedRealityService service)
             if (type == null)
             {
                 Debug.LogWarning("Unable to get a component with a type of null.");
-                manager = null;
+                service = null;
                 return;
             }
 
@@ -1058,8 +1058,8 @@ private bool GetService(Type type, string serviceName, out IMixedRealityService
             if (type == null)
             {
                 Debug.LogWarning("Unable to get a component with a type of null.");
-                manager = null;
-                return;
+                service = null;
+                return false;
             }
 
             service = null;

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`
`4`	`4`	`using Microsoft.MixedReality.Toolkit.Core.Interfaces.Devices;`
`5`	`5`	`using Microsoft.MixedReality.Toolkit.Core.Interfaces.InputSystem;`
`6`		`-using Microsoft.MixedReality.Toolkit.Core.Managers;`
	`6`	`+using Microsoft.MixedReality.Toolkit.Core.Services;`
`7`	`7`	`using Microsoft.MixedReality.Toolkit.Core.Utilities.Async;`
`8`	`8`	`using System.Text;`
`9`	`9`	`using System.Threading.Tasks;`
`@@ -16,7 +16,7 @@`
`16`	`16`	`namespace Microsoft.MixedReality.Toolkit.Core.Devices.VoiceInput`
`17`	`17`	`{`
`18`	`18`	`#if UNITY_STANDALONE_WIN \|\| UNITY_WSA \|\| UNITY_EDITOR_WIN`
`19`		`- public class WindowsDictationInputDeviceManager : BaseDeviceManager, IMixedRealityDictationManager`
	`19`	`+ public class WindowsDictationInputDeviceManager : BaseDeviceManager, IMixedRealityDictationSystem`
`20`	`20`	`{`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Constructor.`
`@@ -72,13 +72,13 @@ public override void Enable()`
`72`	`72`	`{`
`73`	`73`	`if (!Application.isPlaying) { return; }`
`74`	`74`
`75`		`- if (MixedRealityManager.InputSystem == null)`
	`75`	`+ if (MixedRealityToolkit.InputSystem == null)`
`76`	`76`	`{`
`77`	`77`	`Debug.LogWarning("Unable to start Windows Dictation Device Manager. An Input System is required for this feature.");`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`
`81`		`- inputSource = MixedRealityManager.InputSystem.RequestNewGenericInputSource("Dictation Recognizer");`
	`81`	`+ inputSource = MixedRealityToolkit.InputSystem.RequestNewGenericInputSource("Dictation Recognizer");`
`82`	`82`	`dictationResult = string.Empty;`
`83`	`83`
`84`	`84`	`if (dictationRecognizer == null)`
`@@ -95,7 +95,7 @@ public override void Enable()`
`95`	`95`	`/// <inheritdoc />`
`96`	`96`	`public override void Update()`
`97`	`97`	`{`
`98`		`- if (!Application.isPlaying \|\| MixedRealityManager.InputSystem == null) { return; }`
	`98`	`+ if (!Application.isPlaying \|\| MixedRealityToolkit.InputSystem == null) { return; }`
`99`	`99`
`100`	`100`	`if (!isTransitioning && IsListening && !Microphone.IsRecording(deviceName) && dictationRecognizer.Status == SpeechSystemStatus.Running)`
`101`	`101`	`{`
`@@ -106,7 +106,7 @@ public override void Update()`
`106`	`106`	`if (!hasFailed && dictationRecognizer.Status == SpeechSystemStatus.Failed)`
`107`	`107`	`{`
`108`	`108`	`hasFailed = true;`
`109`		`- MixedRealityManager.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer has failed!");`
	`109`	`+ MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer has failed!");`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -141,7 +141,7 @@ public async void StartRecording(GameObject listener, float initialSilenceTimeou`
`141`	`141`	`/// <inheritdoc />`
`142`	`142`	`public async Task StartRecordingAsync(GameObject listener = null, float initialSilenceTimeout = 5f, float autoSilenceTimeout = 20f, int recordingTime = 10, string micDeviceName = "")`
`143`	`143`	`{`
`144`		`- if (IsListening \|\| isTransitioning \|\| MixedRealityManager.InputSystem == null \|\| !Application.isPlaying)`
	`144`	`+ if (IsListening \|\| isTransitioning \|\| MixedRealityToolkit.InputSystem == null \|\| !Application.isPlaying)`
`145`	`145`	`{`
`146`	`146`	`Debug.LogWarning("Unable to start recording");`
`147`	`147`	`return;`
`@@ -154,7 +154,7 @@ public async Task StartRecordingAsync(GameObject listener = null, float initialS`
`154`	`154`	`if (listener != null)`
`155`	`155`	`{`
`156`	`156`	`hasListener = true;`
`157`		`- MixedRealityManager.InputSystem.PushModalInputHandler(listener);`
	`157`	`+ MixedRealityToolkit.InputSystem.PushModalInputHandler(listener);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`if (PhraseRecognitionSystem.Status == SpeechSystemStatus.Running)`
`@@ -179,7 +179,7 @@ public async Task StartRecordingAsync(GameObject listener = null, float initialS`
`179`	`179`
`180`	`180`	`if (dictationRecognizer.Status == SpeechSystemStatus.Failed)`
`181`	`181`	`{`
`182`		`- MixedRealityManager.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer failed to start!");`
	`182`	`+ MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, "Dictation recognizer failed to start!");`
`183`	`183`	`return;`
`184`	`184`	`}`
`185`	`185`
`@@ -209,7 +209,7 @@ public async Task<AudioClip> StopRecordingAsync()`
`209`	`209`
`210`	`210`	`if (hasListener)`
`211`	`211`	`{`
`212`		`- MixedRealityManager.InputSystem.PopModalInputHandler();`
	`212`	`+ MixedRealityToolkit.InputSystem.PopModalInputHandler();`
`213`	`213`	`hasListener = false;`
`214`	`214`	`}`
`215`	`215`
`@@ -241,7 +241,7 @@ private void DictationRecognizer_DictationHypothesis(string text)`
`241`	`241`	`// We don't want to append to textSoFar yet, because the hypothesis may have changed on the next event.`
`242`	`242`	`dictationResult = $"{textSoFar} {text}...";`
`243`	`243`
`244`		`- MixedRealityManager.InputSystem.RaiseDictationHypothesis(inputSource, dictationResult);`
	`244`	`+ MixedRealityToolkit.InputSystem.RaiseDictationHypothesis(inputSource, dictationResult);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`/// <summary>`
`@@ -255,7 +255,7 @@ private void DictationRecognizer_DictationResult(string text, ConfidenceLevel co`
`255`	`255`
`256`	`256`	`dictationResult = textSoFar.ToString();`
`257`	`257`
`258`		`- MixedRealityManager.InputSystem.RaiseDictationResult(inputSource, dictationResult);`
	`258`	`+ MixedRealityToolkit.InputSystem.RaiseDictationResult(inputSource, dictationResult);`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`/// <summary>`
`@@ -273,7 +273,7 @@ private void DictationRecognizer_DictationComplete(DictationCompletionCause caus`
`273`	`273`	`dictationResult = "Dictation has timed out. Please try again.";`
`274`	`274`	`}`
`275`	`275`
`276`		`- MixedRealityManager.InputSystem.RaiseDictationComplete(inputSource, dictationResult, dictationAudioClip);`
	`276`	`+ MixedRealityToolkit.InputSystem.RaiseDictationComplete(inputSource, dictationResult, dictationAudioClip);`
`277`	`277`	`textSoFar = null;`
`278`	`278`	`dictationResult = string.Empty;`
`279`	`279`	`}`
`@@ -287,7 +287,7 @@ private void DictationRecognizer_DictationError(string error, int hresult)`
`287`	`287`	`{`
`288`	`288`	`dictationResult = $"{error}\nHRESULT: {hresult}";`
`289`	`289`
`290`		`- MixedRealityManager.InputSystem.RaiseDictationError(inputSource, dictationResult);`
	`290`	`+ MixedRealityToolkit.InputSystem.RaiseDictationError(inputSource, dictationResult);`
`291`	`291`	`textSoFar = null;`
`292`	`292`	`dictationResult = string.Empty;`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ public void RegisterService(Type type, IMixedRealityService service)`
`501`	`501`	`Debug.LogWarning("Unable to add a manager of type null.");`
`502`	`502`	`return;`
`503`	`503`	`}`
`504`		`- if (manager == null)`
	`504`	`+ if (service == null)`
`505`	`505`	`{`
`506`	`506`	`Debug.LogWarning("Unable to add a manager with a null instance.");`
`507`	`507`	`return;`
`@@ -600,7 +600,7 @@ public IMixedRealityService GetService(Type type, string serviceName)`
`600`	`600`	`{`
`601`	`601`	`if (ActiveProfile == null)`
`602`	`602`	`{`
`603`		`- Debug.LogError($"Unable to get {managerName} Manager as the Mixed Reality Manager has no Active Profile.");`
	`603`	`+ Debug.LogError($"Unable to get {serviceName} Manager as the Mixed Reality Manager has no Active Profile.");`
`604`	`604`	`return null;`
`605`	`605`	`}`
`606`	`606`
`@@ -609,7 +609,7 @@ public IMixedRealityService GetService(Type type, string serviceName)`
`609`	`609`	`Debug.LogError("Unable to get null manager type.");`
`610`	`610`	`return null;`
`611`	`611`	`}`
`612`		`- if (string.IsNullOrEmpty(managerName))`
	`612`	`+ if (string.IsNullOrEmpty(serviceName))`
`613`	`613`	`{`
`614`	`614`	`Debug.LogError("Unable to get manager by name without the name being specified.");`
`615`	`615`	`return null;`
`@@ -627,7 +627,7 @@ public IMixedRealityService GetService(Type type, string serviceName)`
`627`	`627`
`628`	`628`	`if (service == null)`
`629`	`629`	`{`
`630`		`- Debug.LogError($"Unable to find {managerName} Manager.");`
	`630`	`+ Debug.LogError($"Unable to find {serviceName} Manager.");`
`631`	`631`	`}`
`632`	`632`
`633`	`633`	`return service;`
`@@ -676,7 +676,7 @@ public void UnregisterService(Type type, string serviceName)`
`676`	`676`	`{`
`677`	`677`	`if (ActiveProfile == null)`
`678`	`678`	`{`
`679`		`- Debug.LogError($"Unable to remove {managerName} Manager as the Mixed Reality Manager has no Active Profile.");`
	`679`	`+ Debug.LogError($"Unable to remove {serviceName} Manager as the Mixed Reality Manager has no Active Profile.");`
`680`	`680`	`return;`
`681`	`681`	`}`
`682`	`682`
`@@ -686,7 +686,7 @@ public void UnregisterService(Type type, string serviceName)`
`686`	`686`	`return;`
`687`	`687`	`}`
`688`	`688`
`689`		`- if (string.IsNullOrEmpty(managerName))`
	`689`	`+ if (string.IsNullOrEmpty(serviceName))`
`690`	`690`	`{`
`691`	`691`	`Debug.LogError("Unable to remove manager by name without the name being specified.");`
`692`	`692`	`return;`
`@@ -744,7 +744,7 @@ public void DisableService(Type type, string serviceName)`
`744`	`744`	`Debug.LogError("Unable to disable null manager type.");`
`745`	`745`	`return;`
`746`	`746`	`}`
`747`		`- if (string.IsNullOrEmpty(managerName))`
	`747`	`+ if (string.IsNullOrEmpty(serviceName))`
`748`	`748`	`{`
`749`	`749`	`Debug.LogError("Unable to disable manager by name without the name being specified.");`
`750`	`750`	`return;`
`@@ -800,7 +800,7 @@ public void EnableService(Type type, string serviceName)`
`800`	`800`	`Debug.LogError("Unable to enable null manager type.");`
`801`	`801`	`return;`
`802`	`802`	`}`
`803`		`- if (string.IsNullOrEmpty(managerName))`
	`803`	`+ if (string.IsNullOrEmpty(serviceName))`
`804`	`804`	`{`
`805`	`805`	`Debug.LogError("Unable to enable manager by name without the name being specified.");`
`806`	`806`	`return;`
`@@ -833,7 +833,7 @@ public List<IMixedRealityService> GetActiveServices(Type type)`
`833`	`833`	`if (type == null)`
`834`	`834`	`{`
`835`	`835`	`Debug.LogWarning("Unable to get managers with a type of null.");`
`836`		`- return new List<IMixedRealityManager>();`
	`836`	`+ return new List<IMixedRealityService>();`
`837`	`837`	`}`
`838`	`838`
`839`	`839`	`return GetActiveServices(type, string.Empty);`
`@@ -850,13 +850,13 @@ public List<IMixedRealityService> GetActiveServices(Type type, string serviceNam`
`850`	`850`	`if (ActiveProfile == null)`
`851`	`851`	`{`
`852`	`852`	`Debug.LogWarning($"Unable to get {nameof(type)} Manager as the Mixed Reality Manager has no Active Profile");`
`853`		`- return new List<IMixedRealityManager>();`
	`853`	`+ return new List<IMixedRealityService>();`
`854`	`854`	`}`
`855`	`855`
`856`	`856`	`if (type == null)`
`857`	`857`	`{`
`858`	`858`	`Debug.LogWarning("Unable to get managers with a type of null.");`
`859`		`- return new List<IMixedRealityManager>();`
	`859`	`+ return new List<IMixedRealityService>();`
`860`	`860`	`}`
`861`	`861`
`862`	`862`	`var services = new List<IMixedRealityService>();`
`@@ -1040,7 +1040,7 @@ private void GetService(Type type, out IMixedRealityService service)`
`1040`	`1040`	`if (type == null)`
`1041`	`1041`	`{`
`1042`	`1042`	`Debug.LogWarning("Unable to get a component with a type of null.");`
`1043`		`- manager = null;`
	`1043`	`+ service = null;`
`1044`	`1044`	`return;`
`1045`	`1045`	`}`
`1046`	`1046`
`@@ -1058,8 +1058,8 @@ private bool GetService(Type type, string serviceName, out IMixedRealityService`
`1058`	`1058`	`if (type == null)`
`1059`	`1059`	`{`
`1060`	`1060`	`Debug.LogWarning("Unable to get a component with a type of null.");`
`1061`		`- manager = null;`
`1062`		`- return;`
	`1061`	`+ service = null;`
	`1062`	`+ return false;`
`1063`	`1063`	`}`
`1064`	`1064`
`1065`	`1065`	`service = null;`