Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6da4a14 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track rename of org.kxml to com.android.org.kxml 2" am: 69a13ade am: e363bdc8

am: faefa61c

Change-Id: I099773e4ac5fb7c8bb8dfda44d936ae0a4c43d25
parents a3647d51 faefa61c
Loading
Loading
Loading
Loading
+67 −67
Original line number Diff line number Diff line
@@ -12204,11 +12204,11 @@ HPLorg/json/JSONStringer;->value(J)Lorg/json/JSONStringer;
HPLorg/json/JSONStringer;->value(Z)Lorg/json/JSONStringer;
HPLorg/json/JSONTokener;->syntaxError(Ljava/lang/String;)Lorg/json/JSONException;
HPLorg/json/JSONTokener;->toString()Ljava/lang/String;
HPLorg/kxml2/io/KXmlSerializer;->getDepth()I
HPLorg/kxml2/io/KXmlSerializer;->getNamespace()Ljava/lang/String;
HPLorg/kxml2/io/KXmlSerializer;->getPrefix(Ljava/lang/String;ZZ)Ljava/lang/String;
HPLorg/kxml2/io/KXmlSerializer;->setPrefix(Ljava/lang/String;Ljava/lang/String;)V
HPLorg/kxml2/io/KXmlSerializer;->text(Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HPLcom/android/org/kxml2/io/KXmlSerializer;->getDepth()I
HPLcom/android/org/kxml2/io/KXmlSerializer;->getNamespace()Ljava/lang/String;
HPLcom/android/org/kxml2/io/KXmlSerializer;->getPrefix(Ljava/lang/String;ZZ)Ljava/lang/String;
HPLcom/android/org/kxml2/io/KXmlSerializer;->setPrefix(Ljava/lang/String;Ljava/lang/String;)V
HPLcom/android/org/kxml2/io/KXmlSerializer;->text(Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HPLorg/w3c/dom/NamedNodeMap;->getLength()I
HPLorg/w3c/dom/NamedNodeMap;->getNamedItem(Ljava/lang/String;)Lorg/w3c/dom/Node;
HPLorg/w3c/dom/NamedNodeMap;->getNamedItemNS(Ljava/lang/String;Ljava/lang/String;)Lorg/w3c/dom/Node;
@@ -51896,7 +51896,7 @@ HSPLorg/apache/harmony/xml/dom/NodeListImpl;->item(I)Lorg/w3c/dom/Node;
HSPLorg/apache/harmony/xml/dom/TextImpl;->getNodeType()S
HSPLorg/apache/harmony/xml/parsers/DocumentBuilderFactoryImpl;->newDocumentBuilder()Ljavax/xml/parsers/DocumentBuilder;
HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->appendText(Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;ILjava/lang/String;)V
HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lorg/kxml2/io/KXmlParser;Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;I)V
HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lcom/android/org/kxml2/io/KXmlParser;Lorg/apache/harmony/xml/dom/DocumentImpl;Lorg/w3c/dom/Node;I)V
HSPLorg/apache/harmony/xml/parsers/DocumentBuilderImpl;->parse(Lorg/xml/sax/InputSource;)Lorg/w3c/dom/Document;
HSPLorg/apache/harmony/xml/parsers/SAXParserFactoryImpl;->getFeature(Ljava/lang/String;)Z
HSPLorg/apache/harmony/xml/parsers/SAXParserFactoryImpl;->isValidating()Z
@@ -52176,64 +52176,64 @@ HSPLorg/json/JSONTokener;->readEscapeCharacter()C
HSPLorg/json/JSONTokener;->readLiteral()Ljava/lang/Object;
HSPLorg/json/JSONTokener;->readObject()Lorg/json/JSONObject;
HSPLorg/json/JSONTokener;->skipToEndOfLine()V
HSPLorg/kxml2/io/KXmlParser$ValueContext;-><init>(Ljava/lang/String;I)V
HSPLorg/kxml2/io/KXmlParser;-><init>()V
HSPLorg/kxml2/io/KXmlParser;->adjustNsp()Z
HSPLorg/kxml2/io/KXmlParser;->close()V
HSPLorg/kxml2/io/KXmlParser;->fillBuffer(I)Z
HSPLorg/kxml2/io/KXmlParser;->getAttributeCount()I
HSPLorg/kxml2/io/KXmlParser;->getAttributeName(I)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getAttributeNamespace(I)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getAttributePrefix(I)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getAttributeType(I)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getAttributeValue(I)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getAttributeValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getColumnNumber()I
HSPLorg/kxml2/io/KXmlParser;->getDepth()I
HSPLorg/kxml2/io/KXmlParser;->getEventType()I
HSPLorg/kxml2/io/KXmlParser;->getFeature(Ljava/lang/String;)Z
HSPLorg/kxml2/io/KXmlParser;->getLineNumber()I
HSPLorg/kxml2/io/KXmlParser;->getName()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getNamespace()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getNamespace(Ljava/lang/String;)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getNamespaceCount(I)I
HSPLorg/kxml2/io/KXmlParser;->getPositionDescription()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getPrefix()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getText()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->getTextCharacters([I)[C
HSPLorg/kxml2/io/KXmlParser;->next()I
HSPLorg/kxml2/io/KXmlParser;->next(Z)I
HSPLorg/kxml2/io/KXmlParser;->nextTag()I
HSPLorg/kxml2/io/KXmlParser;->nextText()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->nextToken()I
HSPLorg/kxml2/io/KXmlParser;->parseStartTag(ZZ)V
HSPLorg/kxml2/io/KXmlParser;->peekType(Z)I
HSPLorg/kxml2/io/KXmlParser;->read(C)V
HSPLorg/kxml2/io/KXmlParser;->read([C)V
HSPLorg/kxml2/io/KXmlParser;->readComment(Z)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->readEndTag()V
HSPLorg/kxml2/io/KXmlParser;->readEntity(Ljava/lang/StringBuilder;ZZLorg/kxml2/io/KXmlParser$ValueContext;)V
HSPLorg/kxml2/io/KXmlParser;->readName()Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->readUntil([CZ)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->readValue(CZZLorg/kxml2/io/KXmlParser$ValueContext;)Ljava/lang/String;
HSPLorg/kxml2/io/KXmlParser;->readXmlDeclaration()V
HSPLorg/kxml2/io/KXmlParser;->require(ILjava/lang/String;Ljava/lang/String;)V
HSPLorg/kxml2/io/KXmlParser;->setFeature(Ljava/lang/String;Z)V
HSPLorg/kxml2/io/KXmlParser;->setInput(Ljava/io/InputStream;Ljava/lang/String;)V
HSPLorg/kxml2/io/KXmlParser;->setInput(Ljava/io/Reader;)V
HSPLorg/kxml2/io/KXmlSerializer;-><init>()V
HSPLorg/kxml2/io/KXmlSerializer;->append(Ljava/lang/String;II)V
HSPLorg/kxml2/io/KXmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLorg/kxml2/io/KXmlSerializer;->check(Z)V
HSPLorg/kxml2/io/KXmlSerializer;->endDocument()V
HSPLorg/kxml2/io/KXmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLorg/kxml2/io/KXmlSerializer;->flush()V
HSPLorg/kxml2/io/KXmlSerializer;->setFeature(Ljava/lang/String;Z)V
HSPLorg/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V
HSPLorg/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/Writer;)V
HSPLorg/kxml2/io/KXmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V
HSPLorg/kxml2/io/KXmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLorg/kxml2/io/KXmlSerializer;->writeEscaped(Ljava/lang/String;I)V
HSPLcom/android/org/kxml2/io/KXmlParser$ValueContext;-><init>(Ljava/lang/String;I)V
HSPLcom/android/org/kxml2/io/KXmlParser;-><init>()V
HSPLcom/android/org/kxml2/io/KXmlParser;->adjustNsp()Z
HSPLcom/android/org/kxml2/io/KXmlParser;->close()V
HSPLcom/android/org/kxml2/io/KXmlParser;->fillBuffer(I)Z
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeCount()I
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeName(I)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeNamespace(I)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributePrefix(I)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeType(I)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeValue(I)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getAttributeValue(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getColumnNumber()I
HSPLcom/android/org/kxml2/io/KXmlParser;->getDepth()I
HSPLcom/android/org/kxml2/io/KXmlParser;->getEventType()I
HSPLcom/android/org/kxml2/io/KXmlParser;->getFeature(Ljava/lang/String;)Z
HSPLcom/android/org/kxml2/io/KXmlParser;->getLineNumber()I
HSPLcom/android/org/kxml2/io/KXmlParser;->getName()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespace()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespace(Ljava/lang/String;)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getNamespaceCount(I)I
HSPLcom/android/org/kxml2/io/KXmlParser;->getPositionDescription()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getPrefix()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getText()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->getTextCharacters([I)[C
HSPLcom/android/org/kxml2/io/KXmlParser;->next()I
HSPLcom/android/org/kxml2/io/KXmlParser;->next(Z)I
HSPLcom/android/org/kxml2/io/KXmlParser;->nextTag()I
HSPLcom/android/org/kxml2/io/KXmlParser;->nextText()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->nextToken()I
HSPLcom/android/org/kxml2/io/KXmlParser;->parseStartTag(ZZ)V
HSPLcom/android/org/kxml2/io/KXmlParser;->peekType(Z)I
HSPLcom/android/org/kxml2/io/KXmlParser;->read(C)V
HSPLcom/android/org/kxml2/io/KXmlParser;->read([C)V
HSPLcom/android/org/kxml2/io/KXmlParser;->readComment(Z)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->readEndTag()V
HSPLcom/android/org/kxml2/io/KXmlParser;->readEntity(Ljava/lang/StringBuilder;ZZLcom/android/org/kxml2/io/KXmlParser$ValueContext;)V
HSPLcom/android/org/kxml2/io/KXmlParser;->readName()Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->readUntil([CZ)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->readValue(CZZLcom/android/org/kxml2/io/KXmlParser$ValueContext;)Ljava/lang/String;
HSPLcom/android/org/kxml2/io/KXmlParser;->readXmlDeclaration()V
HSPLcom/android/org/kxml2/io/KXmlParser;->require(ILjava/lang/String;Ljava/lang/String;)V
HSPLcom/android/org/kxml2/io/KXmlParser;->setFeature(Ljava/lang/String;Z)V
HSPLcom/android/org/kxml2/io/KXmlParser;->setInput(Ljava/io/InputStream;Ljava/lang/String;)V
HSPLcom/android/org/kxml2/io/KXmlParser;->setInput(Ljava/io/Reader;)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;-><init>()V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->append(Ljava/lang/String;II)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->attribute(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLcom/android/org/kxml2/io/KXmlSerializer;->check(Z)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->endDocument()V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->endTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLcom/android/org/kxml2/io/KXmlSerializer;->flush()V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->setFeature(Ljava/lang/String;Z)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/OutputStream;Ljava/lang/String;)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->setOutput(Ljava/io/Writer;)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->startDocument(Ljava/lang/String;Ljava/lang/Boolean;)V
HSPLcom/android/org/kxml2/io/KXmlSerializer;->startTag(Ljava/lang/String;Ljava/lang/String;)Lorg/xmlpull/v1/XmlSerializer;
HSPLcom/android/org/kxml2/io/KXmlSerializer;->writeEscaped(Ljava/lang/String;I)V
HSPLorg/w3c/dom/Attr;->getName()Ljava/lang/String;
HSPLorg/w3c/dom/Attr;->getOwnerElement()Lorg/w3c/dom/Element;
HSPLorg/w3c/dom/Attr;->getSchemaTypeInfo()Lorg/w3c/dom/TypeInfo;
@@ -63397,9 +63397,9 @@ Lorg/json/JSONObject;
Lorg/json/JSONStringer$Scope;
Lorg/json/JSONStringer;
Lorg/json/JSONTokener;
Lorg/kxml2/io/KXmlParser$ValueContext;
Lorg/kxml2/io/KXmlParser;
Lorg/kxml2/io/KXmlSerializer;
Lcom/android/org/kxml2/io/KXmlParser$ValueContext;
Lcom/android/org/kxml2/io/KXmlParser;
Lcom/android/org/kxml2/io/KXmlSerializer;
Lorg/w3c/dom/CharacterData;
Lorg/w3c/dom/DOMImplementation;
Lorg/w3c/dom/Document;