diff options
| author | Elliott Hughes <enh@google.com> | 2010-03-12 13:09:22 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2010-03-12 13:09:22 -0800 |
| commit | 36b4e83c292e8f069ea6b0e56b11e317c219b761 (patch) | |
| tree | 3db859df2fb39ab6d22b927d1c628c4703fb49ce /luni-kernel/src | |
| parent | 818fc880dd4fcdae53aa7b7444596546283f00de (diff) | |
| download | libcore-36b4e83c292e8f069ea6b0e56b11e317c219b761.zip libcore-36b4e83c292e8f069ea6b0e56b11e317c219b761.tar.gz libcore-36b4e83c292e8f069ea6b0e56b11e317c219b761.tar.bz2 | |
Back out my droiddoc-breaking Object.getClass signature change.
I'll try again when I've got time to fix droiddoc (or we get an SET).
This is a non-functional Java 5/Java 6 difference, so it isn't important.
(Amusingly, there's no need to back out the corresponding api.xml
change: it looks like droiddoc normalizes one but not the other.)
Change-Id: I012ebeb199696d5bd16de63e657b15889d546c5e
Diffstat (limited to 'luni-kernel/src')
| -rw-r--r-- | luni-kernel/src/main/java/java/lang/Object.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni-kernel/src/main/java/java/lang/Object.java b/luni-kernel/src/main/java/java/lang/Object.java index d9613f8..5250871 100644 --- a/luni-kernel/src/main/java/java/lang/Object.java +++ b/luni-kernel/src/main/java/java/lang/Object.java @@ -163,7 +163,7 @@ public class Object { * * @return this object's {@code Class} instance. */ - public final native Class<?> getClass(); + public final native Class<? extends Object> getClass(); /** * Returns an integer hash code for this object. By contract, any two |