From 670d9e8af8105f9676a6b37af6d84a5f0acc76f3 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Sun, 3 Jul 2016 15:54:17 +0100
Subject: [PATCH 1/2] Revert "Make the new bridge the default"

This reverts commit bf79f87895de13123bc0aa59854616b35f931284.
---
 .../facebook/react/ReactInstanceManager.java  | 12 +++++-----
 .../facebook/react/XReactInstanceManager.java | 22 +++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
index 71818459b393a0..ccfd3fa146ee1f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactInstanceManager.java
@@ -195,7 +195,7 @@ public static class Builder {
     protected @Nullable Activity mCurrentActivity;
     protected @Nullable DefaultHardwareBackBtnHandler mDefaultHardwareBackBtnHandler;
     protected @Nullable RedBoxHandler mRedBoxHandler;
-    protected boolean mUseOldBridge;
+    protected boolean mUseNewBridge;
 
     protected Builder() {
     }
@@ -310,8 +310,8 @@ public Builder setRedBoxHandler(@Nullable RedBoxHandler redBoxHandler) {
       return this;
     }
 
-    public Builder setUseOldBridge(boolean enable) {
-      mUseOldBridge = enable;
+    public Builder setUseNewBridge() {
+      mUseNewBridge = true;
       return this;
     }
 
@@ -339,8 +339,8 @@ public ReactInstanceManager build() {
         mUIImplementationProvider = new UIImplementationProvider();
       }
 
-      if (mUseOldBridge) {
-        return new ReactInstanceManagerImpl(
+      if (mUseNewBridge) {
+        return new XReactInstanceManagerImpl(
             Assertions.assertNotNull(
                 mApplication,
                 "Application property has not been set with this builder"),
@@ -357,7 +357,7 @@ public ReactInstanceManager build() {
             mJSCConfig,
             mRedBoxHandler);
       } else {
-        return new XReactInstanceManagerImpl(
+        return new ReactInstanceManagerImpl(
             Assertions.assertNotNull(
                 mApplication,
                 "Application property has not been set with this builder"),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java
new file mode 100644
index 00000000000000..548343fc6a9f3f
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/XReactInstanceManager.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree. An additional grant
+ * of patent rights can be found in the PATENTS file in the same directory.
+ */
+
+package com.facebook.react;
+
+import com.facebook.infer.annotation.Assertions;
+import com.facebook.react.uimanager.UIImplementationProvider;
+
+public abstract class XReactInstanceManager {
+  /**
+   * Creates a builder that is defaulted to using the new bridge.
+   */
+  public static ReactInstanceManager.Builder builder() {
+    return new ReactInstanceManager.Builder().setUseNewBridge();
+  }
+}

From b4aadf48c9cb0555ad4ec39a2f3acd4d88c7f836 Mon Sep 17 00:00:00 2001
From: Konstantin Raev <bestander@fb.com>
Date: Sun, 3 Jul 2016 20:08:50 +0100
Subject: [PATCH 2/2] Revert "Sort keys in createStrictShapeTypeChecker
 message"

This reverts commit eb28c9020584aff82714e2116216c5373a13fb47.
---
 .../Utilities/createStrictShapeTypeChecker.js   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/Libraries/Utilities/createStrictShapeTypeChecker.js b/Libraries/Utilities/createStrictShapeTypeChecker.js
index fcf909bef38d96..b5fe14a1b95051 100644
--- a/Libraries/Utilities/createStrictShapeTypeChecker.js
+++ b/Libraries/Utilities/createStrictShapeTypeChecker.js
@@ -46,15 +46,14 @@ function createStrictShapeTypeChecker(
     var allKeys = merge(props[propName], shapeTypes);
     for (var key in allKeys) {
       var checker = shapeTypes[key];
-      invariant(
-        checker,
-        'Invalid props.%s key `%s` supplied to `%s`.\nBad object: %s\nValid keys: %s',
-        propName,
-        key,
-        componentName,
-        JSON.stringify(props[propName], null, '  '),
-        JSON.stringify(Object.keys(shapeTypes).sort(), null, '  '),
-      );
+      if (!checker) {
+        invariant(
+          false,
+          `Invalid props.${propName} key \`${key}\` supplied to \`${componentName}\`.` +
+            `\nBad object: ` + JSON.stringify(props[propName], null, '  ') +
+            `\nValid keys: ` + JSON.stringify(Object.keys(shapeTypes), null, '  ')
+        );
+      }
       var error = checker(propValue, key, componentName, location);
       if (error) {
         invariant(