| Index: webrtc/base/java/src/org/webrtc/ContextUtils.java
|
| diff --git a/webrtc/base/java/src/org/webrtc/ContextUtils.java b/webrtc/base/java/src/org/webrtc/ContextUtils.java
|
| index 3b9a652fedde5847a75a031fc781bdc821232376..ec9af938ca8a56788fed14354723206b8eaec5ec 100644
|
| --- a/webrtc/base/java/src/org/webrtc/ContextUtils.java
|
| +++ b/webrtc/base/java/src/org/webrtc/ContextUtils.java
|
| @@ -11,12 +11,14 @@
|
| package org.webrtc;
|
|
|
| import android.content.Context;
|
| +import org.webrtc.Logging;
|
|
|
| /**
|
| * Class for storing the application context and retrieving it in a static context. Similar to
|
| * org.chromium.base.ContextUtils.
|
| */
|
| public class ContextUtils {
|
| + private static final String TAG = "ContextUtils";
|
| private static Context applicationContext;
|
|
|
| /**
|
| @@ -25,7 +27,10 @@ public class ContextUtils {
|
| */
|
| public static void initialize(Context applicationContext) {
|
| if (ContextUtils.applicationContext != null) {
|
| - throw new RuntimeException("Multiple ContextUtils.initialize calls.");
|
| + // TODO(sakal): Re-enable after the migration period.
|
| + // throw new RuntimeException("Multiple ContextUtils.initialize calls.");
|
| + Logging.e(
|
| + TAG, "Calling ContextUtils.initialize multiple times, this will crash in the future!");
|
| }
|
| if (applicationContext == null) {
|
| throw new RuntimeException("Application context cannot be null for ContextUtils.initialize.");
|
|
|