From 0b56279da148ff6140d470497430a831ca6e66ea Mon Sep 17 00:00:00 2001
From: sakal <sakal@webrtc.org>
Date: Mon, 23 Jan 2017 03:02:56 -0800
Subject: [PATCH] Catch failure to load native dependencies.

BUG=webrtc:6751

Review-Url: https://codereview.webrtc.org/2652623002
Cr-Commit-Position: refs/heads/master@{#16205}
---
 .../src/org/appspot/apprtc/CallActivity.java        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
index e56d5bcabd..14c2bfe658 100644
--- a/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
+++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java
@@ -64,12 +64,18 @@ import org.webrtc.VideoRenderer;
 public class CallActivity extends Activity implements AppRTCClient.SignalingEvents,
                                                       PeerConnectionClient.PeerConnectionEvents,
                                                       CallFragment.OnCallEvents {
+  private static final String TAG = "CallRTCClient";
+
   // Fix for devices running old Android versions not finding the libraries.
   // https://bugs.chromium.org/p/webrtc/issues/detail?id=6751
   static {
-    System.loadLibrary("c++_shared");
-    System.loadLibrary("boringssl.cr");
-    System.loadLibrary("protobuf_lite.cr");
+    try {
+      System.loadLibrary("c++_shared");
+      System.loadLibrary("boringssl.cr");
+      System.loadLibrary("protobuf_lite.cr");
+    } catch (UnsatisfiedLinkError e) {
+      Logging.w(TAG, "Failed to load native dependencies: ", e);
+    }
   }
 
   public static final String EXTRA_ROOMID = "org.appspot.apprtc.ROOMID";
@@ -118,7 +124,6 @@ public class CallActivity extends Activity implements AppRTCClient.SignalingEven
   public static final String EXTRA_NEGOTIATED = "org.appspot.apprtc.NEGOTIATED";
   public static final String EXTRA_ID = "org.appspot.apprtc.ID";
 
-  private static final String TAG = "CallRTCClient";
   private static final int CAPTURE_PERMISSION_REQUEST_CODE = 1;
 
   // List of mandatory application permissions.