Index: chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java |
index 401e2692aeb6307060d0c31794132ca55b41cbe3..a66722fbb97b993774db422ae11a334216a4972f 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/util/IntentUtils.java |
@@ -173,6 +173,19 @@ public class IntentUtils { |
} |
/** |
+ * Just like {@link Intent#getByteArrayExtra(String)} but doesn't throw exceptions. |
+ */ |
+ public static byte[] safeGetByteArrayExtra(Intent intent, String name) { |
+ try { |
+ return intent.getByteArrayExtra(name); |
+ } catch (Throwable t) { |
+ // Catches un-parceling exceptions. |
+ Log.e(TAG, "getByteArrayExtra failed on intent " + intent); |
+ return null; |
+ } |
+ } |
+ |
+ /** |
* @return a Binder from an Intent, or null. |
* |
* Creates a temporary copy of the extra Bundle, which is required as |