From 71628638f6f1e0fd5ddc7f82ee7dde0f8eacd869 Mon Sep 17 00:00:00 2001
From: Martin Konicek <mkonicek@fb.com>
Date: Tue, 22 Sep 2015 11:15:50 +0100
Subject: [PATCH] Export latest Android changes

---
 .../main/java/com/facebook/react/bridge/UiThreadUtil.java | 8 ++++----
 .../react/modules/core/ExceptionsManagerModule.java       | 2 +-
 .../java/com/facebook/react/views/scroll/ScrollEvent.java | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
index 4fefe98a3..17c8c99fe 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/UiThreadUtil.java
@@ -22,28 +22,28 @@ public class UiThreadUtil {
   @Nullable private static Handler sMainHandler;
 
   /**
-   * @return whether the current thread is the UI thread.
+   * @return {@code true} if the current thread is the UI thread.
    */
   public static boolean isOnUiThread() {
     return Looper.getMainLooper().getThread() == Thread.currentThread();
   }
 
   /**
-   * Throws a {@link AssertionException} if the current thread is not the UI thread.
+   * Throws an {@link AssertionException} if the current thread is not the UI thread.
    */
   public static void assertOnUiThread() {
     SoftAssertions.assertCondition(isOnUiThread(), "Expected to run on UI thread!");
   }
 
   /**
-   * Throws a {@link AssertionException} if the current thread is the UI thread.
+   * Throws an {@link AssertionException} if the current thread is the UI thread.
    */
   public static void assertNotOnUiThread() {
     SoftAssertions.assertCondition(!isOnUiThread(), "Expected not to run on UI thread!");
   }
 
   /**
-   * Runs the given Runnable on the UI thread.
+   * Runs the given {@code Runnable} on the UI thread.
    */
   public static void runOnUiThread(Runnable runnable) {
     synchronized (UiThreadUtil.class) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
index 87ca48b39..876a2fca2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/ExceptionsManagerModule.java
@@ -57,7 +57,7 @@ public class ExceptionsManagerModule extends BaseJavaModule {
   }
 
   @ReactMethod
-  public void reportSoftException(String title, ReadableArray details) {
+  public void reportSoftException(String title, ReadableArray details, int exceptionId) {
     FLog.e(ReactConstants.TAG, title + "\n" + stackTraceToString(details));
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
index af4961936..6d9220037 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ScrollEvent.java
@@ -64,6 +64,12 @@ public class ScrollEvent extends Event<ScrollEvent> {
   }
 
   private WritableMap serializeEventData() {
+    WritableMap contentInset = Arguments.createMap();
+    contentInset.putDouble("top", 0);
+    contentInset.putDouble("bottom", 0);
+    contentInset.putDouble("left", 0);
+    contentInset.putDouble("right", 0);
+
     WritableMap contentOffset = Arguments.createMap();
     contentOffset.putDouble("x", PixelUtil.toDIPFromPixel(mScrollX));
     contentOffset.putDouble("y", PixelUtil.toDIPFromPixel(mScrollY));
@@ -77,6 +83,7 @@ public class ScrollEvent extends Event<ScrollEvent> {
     layoutMeasurement.putDouble("height", PixelUtil.toDIPFromPixel(mScrollViewHeight));
 
     WritableMap event = Arguments.createMap();
+    event.putMap("contentInset", contentInset);
     event.putMap("contentOffset", contentOffset);
     event.putMap("contentSize", contentSize);
     event.putMap("layoutMeasurement", layoutMeasurement);