summaryrefslogtreecommitdiffstats
path: root/libdvm/src/main
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-11-21 18:37:20 -0800
committerBrian Carlstrom <bdc@google.com>2013-11-21 18:39:30 -0800
commit0bdc9f08a3b1cb39bb306a20153be3379e69dc4b (patch)
tree11e9a1e755ae727d39e0e88c17a2af4222e65bb8 /libdvm/src/main
parent00a8f245f5c91b1a61bf5ca3ca690c52496c8731 (diff)
parentee32438e82fbb43838cbc05c0c677d2437ed5cee (diff)
downloadlibcore-0bdc9f08a3b1cb39bb306a20153be3379e69dc4b.zip
libcore-0bdc9f08a3b1cb39bb306a20153be3379e69dc4b.tar.gz
libcore-0bdc9f08a3b1cb39bb306a20153be3379e69dc4b.tar.bz2
resolved conflicts for merge of ee32438e to klp-dev-plus-aosp
Change-Id: I40cb17f0392ca98378ec5349d200750c51cc0e6a
Diffstat (limited to 'libdvm/src/main')
-rw-r--r--libdvm/src/main/java/java/lang/Class.java9
1 files changed, 5 insertions, 4 deletions
diff --git a/libdvm/src/main/java/java/lang/Class.java b/libdvm/src/main/java/java/lang/Class.java
index c825925..af6278d 100644
--- a/libdvm/src/main/java/java/lang/Class.java
+++ b/libdvm/src/main/java/java/lang/Class.java
@@ -820,19 +820,20 @@ public final class Class<T> implements Serializable, AnnotatedElement, GenericDe
* class}.
*/
public Type getGenericSuperclass() {
- Type superClass = getSuperclass();
+ Type genericSuperclass = getSuperclass();
// This method is specified to return null for all cases where getSuperclass
// returns null, i.e, for primitives, interfaces, void and java.lang.Object.
- if (superClass == null) {
+
+ if (genericSuperclass == null) {
return null;
}
String annotationSignature = AnnotationAccess.getSignature(this);
if (annotationSignature != null) {
GenericSignatureParser parser = new GenericSignatureParser(getClassLoader());
parser.parseForClass(this, annotationSignature);
- superClass = parser.superclassType;
+ genericSuperclass = parser.superclassType;
}
- return Types.getType(superClass);
+ return Types.getType(genericSuperclass);
}
/**