Modifies SDK and iOS detection for helper method that needs iOS 9+

webrtc/modules/utility/source/helpers_ios.mm

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #if defined(WEBRTC_IOS)
 
 #import <AVFoundation/AVFoundation.h>
 #import <Foundation/Foundation.h>
 #import <sys/sysctl.h>
 #import <UIKit/UIKit.h>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/utility/include/helpers_ios.h"
 
 namespace webrtc {
 namespace ios {
 
+#define SYSTEM_VERSION_EQUAL_TO(v)           \
+  ([[[UIDevice currentDevice] systemVersion] \

[tkchin_webrtc, 2016/03/01 21:51:34]

can just use doubleValue to make these comparisons easier

[henrika_webrtc, 2016/03/02 14:49:50]

Great idea, thanks!

+       compare:v                             \
+       options:NSNumericSearch] == NSOrderedSame)
+#define SYSTEM_VERSION_GREATER_THAN(v)       \
+  ([[[UIDevice currentDevice] systemVersion] \
+       compare:v                             \
+       options:NSNumericSearch] == NSOrderedDescending)
+#define SYSTEM_VERSION_GREATER_THAN_OR_EQUAL_TO(v) \
+  ([[[UIDevice currentDevice] systemVersion]       \
+       compare:v                                   \
+       options:NSNumericSearch] != NSOrderedAscending)
+#define SYSTEM_VERSION_LESS_THAN(v)          \
+  ([[[UIDevice currentDevice] systemVersion] \
+       compare:v                             \
+       options:NSNumericSearch] == NSOrderedAscending)
+#define SYSTEM_VERSION_LESS_THAN_OR_EQUAL_TO(v) \
+  ([[[UIDevice currentDevice] systemVersion]    \
+       compare:v                                \
+       options:NSNumericSearch] != NSOrderedDescending)
+
 // Internal helper method used by GetDeviceName() to return device name.
 const char* LookUpRealName(const char* raw_name) {
   // Lookup table which maps raw device names to real (human readable) names.
   struct {
     const char* raw_name;
     const char* real_name;
   } device_names[] = {
       {"iPhone1,1", "iPhone 1G"},
       {"iPhone1,2", "iPhone 3G"},
       {"iPhone2,1", "iPhone 3GS"},
@@ skipping 126 matching lines @@
 std::string GetOSVersionString() {
   NSString* osVersion =
       [NSProcessInfo processInfo].operatingSystemVersionString;
   return StdStringFromNSString(osVersion);
 }
 
 int GetProcessorCount() {
   return [NSProcessInfo processInfo].processorCount;
 }
 
+#if defined(__IPHONE_9_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_9_0
 bool GetLowPowerModeEnabled() {
+  // lowPoweredModeEnabled is only available on iOS9+.
+  if
+    SYSTEM_VERSION_LESS_THAN(@"9.0.0") {

[tkchin_webrtc, 2016/03/01 21:51:33]

Wouldn't use macros. Instead have a bunch of functions you can call with cached
value.

e.g.
double GetSystemVersion() {
  static dispatch_once once_token;
  static double system_version;
  dispatch_once(&once_token, ^{
    system_version = [UIDevice currentDevice].systemVersion.doubleValue;
  });
  return system_version;
}

then e.g.:

bool isIos9OrGreater() {
  return GetSystemVersion() >= 9.0;
}

[henrika_webrtc, 2016/03/02 14:49:50]

Done.

+      LOG(LS_WARNING) << "webrtc::ios::GetLowPowerModeEnabled() is not "
+                         "supported. Requires at least iOS 9.0";
+      return false;
+    }
   NSProcessInfo* info = [NSProcessInfo processInfo];
-  // lowPoweredModeEnabled is only available on iOS9+.
-  if ([info respondsToSelector:@selector(lowPoweredModeEnabled)]) {
-    return info.lowPowerModeEnabled;
-  }
-  return false;
+  return info.lowPowerModeEnabled;
 }
+#else
+// TODO(henrika): can't use iOS 9 APIs as the SDK version doesn't support

[tkchin_webrtc, 2016/03/01 21:51:34]

If it's unavailable we should just not use it. That means adding the
availability checks everywhere the function is used though.

[henrika_webrtc, 2016/03/02 14:49:50]

Done.

+// them. What is the best thing to do here? User will get linker error;
+// should be sufficient, right?
+#endif
 
 }  // namespace ios
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_IOS)