diff options
| author | Jeff Brown <jeffbrown@google.com> | 2011-01-19 18:00:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-01-19 18:00:50 -0800 |
| commit | c0d4062965b392dffef267ad4835930d504ca39f (patch) | |
| tree | 108b7dc889d58181cee377759656e10b55a20f00 /core | |
| parent | 1dbaabe719b3e5dd067f6147628f11ac70cdc95c (diff) | |
| parent | e200420e168ae135f6e87ee3a1abd44c971a1fe4 (diff) | |
| download | frameworks_base-c0d4062965b392dffef267ad4835930d504ca39f.zip frameworks_base-c0d4062965b392dffef267ad4835930d504ca39f.tar.gz frameworks_base-c0d4062965b392dffef267ad4835930d504ca39f.tar.bz2 | |
am e200420e: am d49f3e00: Merge "Rename KeyCharacterMap.UnavailableException." into honeycomb
* commit 'e200420e168ae135f6e87ee3a1abd44c971a1fe4':
Rename KeyCharacterMap.UnavailableException.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/KeyCharacterMap.java | 6 | ||||
| -rwxr-xr-x | core/java/android/view/KeyEvent.java | 2 |
2 files changed, 4 insertions, 4 deletions
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 @@ 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); } } diff --git a/core/java/android/view/KeyEvent.java b/core/java/android/view/KeyEvent.java index 695d16a..766969a 100755 --- a/core/java/android/view/KeyEvent.java +++ b/core/java/android/view/KeyEvent.java @@ -2211,7 +2211,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. * |