Revert "ExpatParser LP64 fixes."
This reverts commit a8a1e201e415abfd6b5ae4fed98c8aa491e15af9.
This causes YouTube to crash on launch. Reverting to give myself more time to investigate.
Change-Id: I9ee107383a4f206ca83dd267baad77445eba3fce
diff --git a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
index fa6308e..db6f4ef 100644
--- a/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
+++ b/luni/src/main/java/org/apache/harmony/xml/ExpatParser.java
@@ -48,7 +48,7 @@
private boolean inStartElement = false;
private int attributeCount = -1;
- private long attributePointer = 0;
+ private int attributePointer = 0;
private final Locator locator = new ExpatLocator();
@@ -129,7 +129,7 @@
* @param attributeCount number of attributes
*/
/*package*/ void startElement(String uri, String localName, String qName,
- long attributePointer, int attributeCount) throws SAXException {
+ int attributePointer, int attributeCount) throws SAXException {
ContentHandler contentHandler = xmlReader.contentHandler;
if (contentHandler == null) {
return;
@@ -772,7 +772,7 @@
@Override
void startElement(String uri, String localName, String qName,
- long attributePointer, int attributeCount) throws SAXException {
+ int attributePointer, int attributeCount) throws SAXException {
/*
* Skip topmost element generated by our workaround in
* {@link #handleExternalEntity}.
diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
index af34fb8..6ba055a 100644
--- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
+++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp
@@ -1291,7 +1291,7 @@
static void ExpatParser_staticInitialize(JNIEnv* env, jobject classObject, jstring empty) {
jclass clazz = reinterpret_cast<jclass>(classObject);
startElementMethod = env->GetMethodID(clazz, "startElement",
- "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;JI)V");
+ "(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;II)V");
if (startElementMethod == NULL) return;
endElementMethod = env->GetMethodID(clazz, "endElement",