Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
diff --git a/api/11.xml b/api/11.xml
index 31cfc85..7db0328 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -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"
diff --git a/api/current.xml b/api/current.xml
index 83bfedb..75b1dc2 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -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"
diff --git a/core/java/android/view/KeyCharacterMap.java b/core/java/android/view/KeyCharacterMap.java
index 7ca5a19..3ff7fcd 100644
--- a/core/java/android/view/KeyCharacterMap.java
+++ b/core/java/android/view/KeyCharacterMap.java
@@ -170,7 +170,7 @@
*
* @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 @@
/**
* 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);
}
}
diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java
index ecf1aef..941331a 100755
--- a/core/java/android/view/KeyEvent.java
+++ b/core/java/android/view/KeyEvent.java
@@ -2163,7 +2163,7 @@
* 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.
*