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

Commit d49f3e00 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb

parents a82bcf6a 7e1e21fd

api/11.xml

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

</field>

</class>

<class name="KeyCharacterMap.KeyCharacterMapUnavailableException"

 extends="android.util.AndroidRuntimeException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="KeyCharacterMap.KeyCharacterMapUnavailableException"

 type="android.view.KeyCharacterMap.KeyCharacterMapUnavailableException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

</class>

<class name="KeyCharacterMap.KeyData"

 extends="java.lang.Object"

 abstract="false"
@@ -206463,6 +206444,25 @@ 
>

</field>

</class>

<class name="KeyCharacterMap.UnavailableException"

 extends="android.util.AndroidRuntimeException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="KeyCharacterMap.UnavailableException"

 type="android.view.KeyCharacterMap.UnavailableException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

</class>

<class name="KeyEvent"

 extends="android.view.InputEvent"

 abstract="false"

api/current.xml

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

</field>

</class>

<class name="KeyCharacterMap.KeyCharacterMapUnavailableException"

 extends="android.util.AndroidRuntimeException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="KeyCharacterMap.KeyCharacterMapUnavailableException"

 type="android.view.KeyCharacterMap.KeyCharacterMapUnavailableException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

</class>

<class name="KeyCharacterMap.KeyData"

 extends="java.lang.Object"

 abstract="false"
@@ -206474,6 +206455,25 @@ 
>

</field>

</class>

<class name="KeyCharacterMap.UnavailableException"

 extends="android.util.AndroidRuntimeException"

 abstract="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<constructor name="KeyCharacterMap.UnavailableException"

 type="android.view.KeyCharacterMap.UnavailableException"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

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

</parameter>

</constructor>

</class>

<class name="KeyEvent"

 extends="android.view.InputEvent"

 abstract="false"

core/java/android/view/KeyCharacterMap.java

+3 −3
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class KeyCharacterMap { 
     *

     * @param deviceId The device id of the keyboard.

     * @return The associated key character map.

     * @throws {@link KeyCharacterMapUnavailableException} if the key character map

     * @throws {@link UnavailableException} if the key character map

     * could not be loaded because it was malformed or the default key character map

     * is missing from the system.

     */
@@ -692,8 +692,8 @@ public class KeyCharacterMap { 
    /**

     * Thrown by {@link KeyCharacterMap#load} when a key character map could not be loaded.

     */

    public static class KeyCharacterMapUnavailableException extends AndroidRuntimeException {

        public KeyCharacterMapUnavailableException(String msg) {

    public static class UnavailableException extends AndroidRuntimeException {

        public UnavailableException(String msg) {

            super(msg);

        }

    }

core/java/android/view/KeyEvent.java

+1 −1
Original line number Diff line number Diff line
@@ -2163,7 +2163,7 @@ public class KeyEvent extends InputEvent implements Parcelable { 
     * Gets the {@link KeyCharacterMap} associated with the keyboard device.

     *

     * @return The associated key character map.

     * @throws {@link KeyCharacterMapUnavailableException} if the key character map

     * @throws {@link UnavailableException} if the key character map

     * could not be loaded because it was malformed or the default key character map

     * is missing from the system.

     *