Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 315fae20 authored by Andy Stadler's avatar Andy Stadler Committed by Android (Google) Code Review
Browse files

Merge "Throw Base64DataException instead of IOException" into honeycomb

parents a4967fac c5a0ce24

api/11.xml

+112 −0
Original line number Diff line number Diff line
@@ -199955,6 +199955,25 @@ 
>

</field>

</class>

<class name="Base64DataException"

 extends="java.io.IOException"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64DataException"

 type="android.util.Base64DataException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="detailMessage" type="java.lang.String">

</parameter>

</constructor>

</class>

<class name="Base64InputStream"

 extends="java.io.FilterInputStream"

 abstract="false"
@@ -214823,6 +214842,19 @@ 
<parameter name="selected" type="boolean">

</parameter>

</method>

<method name="dispatchSystemUiVisibilityChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="visibility" type="int">

</parameter>

</method>

<method name="dispatchTouchEvent"

 return="boolean"

 abstract="false"
@@ -215876,6 +215908,17 @@ 
 visibility="protected"

>

</method>

<method name="getSystemUiVisibility"

 return="int"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getTag"

 return="java.lang.Object"

 abstract="false"
@@ -218126,6 +218169,19 @@ 
<parameter name="l" type="android.view.View.OnLongClickListener">

</parameter>

</method>

<method name="setOnSystemUiVisibilityChangeListener"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="l" type="android.view.View.OnSystemUiVisibilityChangeListener">

</parameter>

</method>

<method name="setOnTouchListener"

 return="void"

 abstract="false"
@@ -218379,6 +218435,19 @@ 
<parameter name="soundEffectsEnabled" type="boolean">

</parameter>

</method>

<method name="setSystemUiVisibility"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="visibility" type="int">

</parameter>

</method>

<method name="setTag"

 return="void"

 abstract="false"
@@ -219386,6 +219455,28 @@ 
 visibility="public"

>

</field>

<field name="STATUS_BAR_HIDDEN"

 type="int"

 transient="false"

 volatile="false"

 value="1"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="STATUS_BAR_VISIBLE"

 type="int"

 transient="false"

 volatile="false"

 value="0"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="VIEW_LOG_TAG"

 type="java.lang.String"

 transient="false"
@@ -219804,6 +219895,27 @@ 
</parameter>

</method>

</interface>

<interface name="View.OnSystemUiVisibilityChangeListener"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onSystemUiVisibilityChange"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="visibility" type="int">

</parameter>

</method>

</interface>

<interface name="View.OnTouchListener"

 abstract="true"

 static="true"

api/current.xml

+19 −0
Original line number Diff line number Diff line
@@ -199955,6 +199955,25 @@ 
>

</field>

</class>

<class name="Base64DataException"

 extends="java.io.IOException"

 abstract="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="Base64DataException"

 type="android.util.Base64DataException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="detailMessage" type="java.lang.String">

</parameter>

</constructor>

</class>

<class name="Base64InputStream"

 extends="java.io.FilterInputStream"

 abstract="false"

core/java/android/util/Base64DataException.java

0 → 100644
+30 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.util;



import java.io.IOException;



/**

 * This exception is thrown by {@link Base64InputStream} or {@link Base64OutputStream}

 * when an error is detected in the data being decoded.  This allows problems with the base64 data

 * to be disambiguated from errors in the underlying streams (e.g. actual connection errors.)

 */

public class Base64DataException extends IOException {

    public Base64DataException(String detailMessage) {

        super(detailMessage);

    }

}

core/java/android/util/Base64InputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class Base64InputStream extends FilterInputStream { 
            success = coder.process(inputBuffer, 0, bytesRead, false);

        }

        if (!success) {

            throw new IOException("bad base-64");

            throw new Base64DataException("bad base-64");

        }

        outputEnd = coder.op;

        outputStart = 0;

core/java/android/util/Base64OutputStream.java

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ public class Base64OutputStream extends FilterOutputStream { 
    private void internalWrite(byte[] b, int off, int len, boolean finish) throws IOException {

        coder.output = embiggen(coder.output, coder.maxOutputSize(len));

        if (!coder.process(b, off, len, finish)) {

            throw new IOException("bad base-64");

            throw new Base64DataException("bad base-64");

        }

        out.write(coder.output, 0, coder.op);

    }