Ensured that suspend/resume correctly handles the re-creation of a surface.

Author: osinoleg

cocos2d/Platforms/Android/CCActivity.m

@@ -226,6 +226,8 @@ - (void)startGL:(JavaObject<AndroidSurfaceHolder> *)holder
 
         _gameLoop = [NSRunLoop currentRunLoop];
 
+        [_gameLoop addPort:[NSPort port] forMode:NSDefaultRunLoopMode]; // Ensure that _gameLoop always has a source.
+        
         [self setupView:holder];
 
         [self setupPaths];
@@ -310,12 +312,17 @@ - (void)surfaceCreated:(JavaObject<AndroidSurfaceHolder> *)holder
 - (void)surfaceDestroyed:(JavaObject<AndroidSurfaceHolder> *)holder
 {
 #if USE_MAIN_THREAD
-    [self finish];
+    [self handleDestroy];
 #else
-    [self performSelector:@selector(finish) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
+    [self performSelector:@selector(handleDestroy) onThread:_thread withObject:nil waitUntilDone:NO modes:@[NSDefaultRunLoopMode]];
 #endif
 }
 
+- (void)handleDestroy
+{
+    [[CCDirector sharedDirector] stopAnimation];
+}
+
 - (BOOL)onKeyDown:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event
 {
     return NO;

cocos2d/Platforms/Android/CCGLView.m

@@ -491,10 +491,14 @@ - (BOOL)setupView:(ANativeWindow*)window
 
     if(eglGetError() != EGL_SUCCESS) { NSLog(@"EGL ERROR: %i", eglGetError()); };
 
-    if(!(_eglContext = eglCreateContext(_eglDisplay, _eglConfiguration, 0, contextAttribs)))
+    if(_eglContext == nil)
     {
-        NSLog(@"eglCreateContext() returned error %d", eglGetError());
-        return NO;
+        if(!(_eglContext = eglCreateContext(_eglDisplay, _eglConfiguration, 0, contextAttribs)))
+        {
+            NSLog(@"eglCreateContext() returned error %d", eglGetError());
+            return NO;
+        
+        }
     }
 
     if(eglGetError() != EGL_SUCCESS) { NSLog(@"EGL ERROR: %i", eglGetError()); };