commit 156d6e3c0f8c74683e885b3d50bc6da8318ea814
author andersc <andersc@webrtc.org> Wed Aug 23 13:04:17 2017
committer Commit Bot <commit-bot@chromium.org> Wed Aug 23 13:04:17 2017
tree 39c64ed3414391662cd032bafd6458c8d44da6c6
parent 6a5ac8fb3b8531cea16fc0234b6ea58fe7343e9a

ObjC: Always dispatch async in UIApplication status observer.

Fixes a possible deadlock.

BUG=webrtc:8130

Review-Url: https://codereview.webrtc.org/3003633002
Cr-Original-Commit-Position: refs/heads/master@{#19464}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: cca0006e33c106a7f62df1a1b50f84676cc5ed1e

sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m

diff --git a/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
index 718aeca..c598a0e 100644
--- a/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
+++ b/sdk/objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m
@@ -14,7 +14,11 @@
 
 #import <UIKit/UIKit.h>
 
+#include "webrtc/rtc_base/checks.h"
+
 @implementation RTCUIApplicationStatusObserver {
+  BOOL _initialized;
+  dispatch_block_t _initializeBlock;
   UIApplicationState _state;
 }
 
@@ -45,21 +49,24 @@
                       _state = [UIApplication sharedApplication].applicationState;
                     }];
 
-    dispatch_block_t initializeBlock = ^{
+    _initialized = NO;
+    _initializeBlock = dispatch_block_create(DISPATCH_BLOCK_INHERIT_QOS_CLASS, ^{
       _state = [UIApplication sharedApplication].applicationState;
-    };
+      _initialized = YES;
+    });
 
-    if ([NSThread isMainThread]) {
-      initializeBlock();
-    } else {
-      dispatch_sync(dispatch_get_main_queue(), initializeBlock);
-    }
+    dispatch_async(dispatch_get_main_queue(), _initializeBlock);
   }
 
   return self;
 }
 
 - (BOOL)isApplicationActive {
+  if (!_initialized) {
+    long ret =
+        dispatch_block_wait(_initializeBlock, dispatch_time(DISPATCH_TIME_NOW, 1.0 * NSEC_PER_SEC));
+    RTC_CHECK_EQ(ret, 0);
+  }
   return _state == UIApplicationStateActive;
 }