[DataLayer] Fix for #35623

Mangopony · Apr 1, 2016 · bd4fe3a · bd4fe3a
1 parent 6893531
commit bd4fe3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/wear/DataLayer/DataLayer/MainActivity.cs b/wear/DataLayer/DataLayer/MainActivity.cs
@@ -116,13 +116,13 @@ protected override void OnPause ()
 
 		protected override async void OnStop ()
 		{
+			base.OnStop ();
 			if (!mResolvingError) {
 				await WearableClass.DataApi.RemoveListenerAsync (mGoogleApiClient, this);
                 await WearableClass.MessageApi.RemoveListenerAsync (mGoogleApiClient, this);
                 await WearableClass.NodeApi.RemoveListenerAsync (mGoogleApiClient, this);
 				mGoogleApiClient.Disconnect ();
 			}
-			base.OnStop ();
 		}
 
 		public async void OnConnected (Bundle connectionHint)
@@ -172,7 +172,7 @@ public void OnDataChanged (DataEventBuffer dataEvents)
 			LOGD (Tag, "OnDataChanged: " + dataEvents);
 			var events = new List<IDataEvent> ();
             events.AddRange (dataEvents);
-			dataEvents.Close ();
+			//dataEvents.Close ();
 			RunOnUiThread (() => {
 				foreach (var ev in events)
 				{

diff --git a/wear/DataLayer/Wearable/DataLayerListenerService.cs b/wear/DataLayer/Wearable/DataLayerListenerService.cs
@@ -43,7 +43,7 @@ public override async void OnDataChanged (DataEventBuffer dataEvents)
 		{
 			LOGD (Tag, "OnDataChanged: " + dataEvents);
 			IList events = FreezableUtils.FreezeIterable (dataEvents);
-			dataEvents.Close ();
+			dataEvents.Release ();
 			if (!googleApiClient.IsConnected) {
 				ConnectionResult connectionResult = googleApiClient.BlockingConnect (30, TimeUnit.Seconds);
 				if (!connectionResult.IsSuccess) {

diff --git a/wear/DataLayer/Wearable/MainActivity.cs b/wear/DataLayer/Wearable/MainActivity.cs
@@ -111,7 +111,7 @@ public async void OnDataChanged (DataEventBuffer dataEvents)
 			DataLayerListenerService.LOGD (Tag, "OnDatachanged() : " + dataEvents);
 
 			IList events = FreezableUtils.FreezeIterable (dataEvents);
-			dataEvents.Close ();
+			dataEvents.Release();
 			foreach (var ev in events) {
 				var e = ((Java.Lang.Object)ev).JavaCast<IDataEvent> ();
 				if (e.Type == DataEvent.TypeChanged) {