Bug 723550 - Lots of base64 decode errors in logcat [r=blassey a=akeybl]
authorBrian Nicholson <bnicholson@mozilla.com>
Fri, 03 Feb 2012 15:55:09 -0500
changeset 88339 01693365cd8501f4f76e71b2783fa14c03a4f32e
parent 88338 de903fa58268937a1d173592bdd3c433aa1558c8
child 88340 b1cd565bc9991489adce96e442f68c057e76e617
push idunknown
push userunknown
push dateunknown
reviewersblassey, akeybl
bugs723550
milestone12.0a2
Bug 723550 - Lots of base64 decode errors in logcat [r=blassey a=akeybl]
mobile/android/base/GeckoAppShell.java
--- a/mobile/android/base/GeckoAppShell.java
+++ b/mobile/android/base/GeckoAppShell.java
@@ -1864,17 +1864,17 @@ public class GeckoAppShell
      * @param in    A character array containing the Base64 encoded data.
      * @param iOff  Offset of the first character in <code>in</code> to be processed.
      * @param iLen  Number of characters to process in <code>in</code>, starting at <code>iOff</code>.
      * @return      An array containing the decoded data bytes.
      * @throws      IllegalArgumentException If the input is not valid Base64 encoded data.
      */
     public static byte[] decodeBase64(byte[] in) {
         if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.FROYO)
-            return Base64.decode(in, GUID_ENCODE_FLAGS);
+            return Base64.decode(in, Base64.DEFAULT);
         int iOff = 0;
         int iLen = in.length;
         if (iLen%4 != 0) throw new IllegalArgumentException ("Length of Base64 encoded input string is not a multiple of 4.");
         while (iLen > 0 && in[iOff+iLen-1] == '=') iLen--;
         int oLen = (iLen*3) / 4;
         byte[] out = new byte[oLen];
         int ip = iOff;
         int iEnd = iOff + iLen;