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

Commit 2269d157 authored by Dianne Hackborn's avatar Dianne Hackborn
Browse files

Re-arrange android-common so framework no longer links with it.

This is the framework part, moving classes around so the framework
no longer needs to link to android-common.  Makes some APIs public,
others that didn't need to be public are private in the framework,
some small things are copied.
parent e46145f7
Loading
Loading
Loading
Loading
+489 −0
Original line number Diff line number Diff line
@@ -89978,6 +89978,356 @@
</package>
<package name="android.net.http"
>
<class name="AndroidHttpClient"
 extends="java.lang.Object"
 abstract="false"
 static="false"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
<implements name="org.apache.http.client.HttpClient">
</implements>
<method name="close"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="disableCurlLogging"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="enableCurlLogging"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="name" type="java.lang.String">
</parameter>
<parameter name="level" type="int">
</parameter>
</method>
<method name="execute"
 return="org.apache.http.HttpResponse"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="org.apache.http.HttpResponse"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
</parameter>
<parameter name="context" type="org.apache.http.protocol.HttpContext">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="org.apache.http.HttpResponse"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="target" type="org.apache.http.HttpHost">
</parameter>
<parameter name="request" type="org.apache.http.HttpRequest">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="org.apache.http.HttpResponse"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="target" type="org.apache.http.HttpHost">
</parameter>
<parameter name="request" type="org.apache.http.HttpRequest">
</parameter>
<parameter name="context" type="org.apache.http.protocol.HttpContext">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="T"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
</parameter>
<parameter name="responseHandler" type="org.apache.http.client.ResponseHandler&lt;? extends T&gt;">
</parameter>
<exception name="ClientProtocolException" type="org.apache.http.client.ClientProtocolException">
</exception>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="T"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="request" type="org.apache.http.client.methods.HttpUriRequest">
</parameter>
<parameter name="responseHandler" type="org.apache.http.client.ResponseHandler&lt;? extends T&gt;">
</parameter>
<parameter name="context" type="org.apache.http.protocol.HttpContext">
</parameter>
<exception name="ClientProtocolException" type="org.apache.http.client.ClientProtocolException">
</exception>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="T"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="target" type="org.apache.http.HttpHost">
</parameter>
<parameter name="request" type="org.apache.http.HttpRequest">
</parameter>
<parameter name="responseHandler" type="org.apache.http.client.ResponseHandler&lt;? extends T&gt;">
</parameter>
<exception name="ClientProtocolException" type="org.apache.http.client.ClientProtocolException">
</exception>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="execute"
 return="T"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="target" type="org.apache.http.HttpHost">
</parameter>
<parameter name="request" type="org.apache.http.HttpRequest">
</parameter>
<parameter name="responseHandler" type="org.apache.http.client.ResponseHandler&lt;? extends T&gt;">
</parameter>
<parameter name="context" type="org.apache.http.protocol.HttpContext">
</parameter>
<exception name="ClientProtocolException" type="org.apache.http.client.ClientProtocolException">
</exception>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="getCompressedEntity"
 return="org.apache.http.entity.AbstractHttpEntity"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="data" type="byte[]">
</parameter>
<parameter name="resolver" type="android.content.ContentResolver">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="getConnectionManager"
 return="org.apache.http.conn.ClientConnectionManager"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="getMinGzipSize"
 return="long"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="resolver" type="android.content.ContentResolver">
</parameter>
</method>
<method name="getParams"
 return="org.apache.http.params.HttpParams"
 abstract="false"
 native="false"
 synchronized="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</method>
<method name="getUngzippedContent"
 return="java.io.InputStream"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="entity" type="org.apache.http.HttpEntity">
</parameter>
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="modifyRequestToAcceptGzipResponse"
 return="void"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="request" type="org.apache.http.HttpRequest">
</parameter>
</method>
<method name="newInstance"
 return="android.net.http.AndroidHttpClient"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="userAgent" type="java.lang.String">
</parameter>
<parameter name="context" type="android.content.Context">
</parameter>
</method>
<method name="newInstance"
 return="android.net.http.AndroidHttpClient"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="userAgent" type="java.lang.String">
</parameter>
</method>
<field name="DEFAULT_SYNC_MIN_GZIP_BYTES"
 type="long"
 transient="false"
 volatile="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</field>
</class>
<class name="HttpDateTime"
 extends="java.lang.Object"
 abstract="false"
 static="false"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
<constructor name="HttpDateTime"
 type="android.net.http.HttpDateTime"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
</constructor>
<method name="parse"
 return="java.lang.Long"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="timeString" type="java.lang.String">
</parameter>
<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
</exception>
</method>
</class>
<class name="SslCertificate"
 extends="java.lang.Object"
 abstract="false"
@@ -137783,6 +138133,17 @@
 visibility="public"
>
</field>
<field name="EXTRA_CALLING_PACKAGE"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;calling_package&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="EXTRA_LANGUAGE"
 type="java.lang.String"
 transient="false"
@@ -163521,6 +163882,134 @@
>
</field>
</class>
<class name="Patterns"
 extends="java.lang.Object"
 abstract="false"
 static="false"
 final="false"
 deprecated="not deprecated"
 visibility="public"
>
<method name="concatGroups"
 return="java.lang.String"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="matcher" type="java.util.regex.Matcher">
</parameter>
</method>
<method name="digitsAndPlusOnly"
 return="java.lang.String"
 abstract="false"
 native="false"
 synchronized="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
<parameter name="matcher" type="java.util.regex.Matcher">
</parameter>
</method>
<field name="DOMAIN_NAME"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="EMAIL_ADDRESS"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="GOOD_IRI_CHAR"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;a-zA-Z0-9\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="IP_ADDRESS"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="PHONE"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="TOP_LEVEL_DOMAIN"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="TOP_LEVEL_DOMAIN_STR"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;((aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(biz|b[abdefghijmnorstvwyz])|(cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(edu|e[cegrstu])|f[ijkmor]|(gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(info|int|i[delmnoqrst])|(jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(name|net|n[acefgilopruz])|(org|om)|(pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)|y[etu]|z[amw])&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="TOP_LEVEL_DOMAIN_STR_FOR_WEB_URL"
 type="java.lang.String"
 transient="false"
 volatile="false"
 value="&quot;(?:(?:aero|arpa|asia|a[cdefgilmnoqrstuwxz])|(?:biz|b[abdefghijmnorstvwyz])|(?:cat|com|coop|c[acdfghiklmnoruvxyz])|d[ejkmoz]|(?:edu|e[cegrstu])|f[ijkmor]|(?:gov|g[abdefghilmnpqrstuwy])|h[kmnrtu]|(?:info|int|i[delmnoqrst])|(?:jobs|j[emop])|k[eghimnprwyz]|l[abcikrstuvy]|(?:mil|mobi|museum|m[acdeghklmnopqrstuvwxyz])|(?:name|net|n[acefgilopruz])|(?:org|om)|(?:pro|p[aefghklmnrstwy])|qa|r[eosuw]|s[abcdeghijklmnortuvyz]|(?:tel|travel|t[cdfghjklmnoprtvwz])|u[agksyz]|v[aceginu]|w[fs]|(?:xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)|y[etu]|z[amw]))&quot;"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
<field name="WEB_URL"
 type="java.util.regex.Pattern"
 transient="false"
 volatile="false"
 static="true"
 final="true"
 deprecated="not deprecated"
 visibility="public"
>
</field>
</class>
<class name="PrintStreamPrinter"
 extends="java.lang.Object"
 abstract="false"
+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.common;

import android.content.SharedPreferences;
import android.net.http.HttpDateTime;
import android.text.format.Time;

import java.util.Map;
+0 −9
Original line number Diff line number Diff line
@@ -24,15 +24,6 @@ package com.android.common.speech;
 */
public class Recognition {
    
    /**
     * The extra key used in an intent to the speech recognizer for voice search. Not
     * generally to be used by developers. The system search dialog uses this, for example,
     * to set a calling package for identification by a voice search API. If this extra
     * is set by anyone but the system process, it should be overridden by the voice search
     * implementation.
     */
    public static final String EXTRA_CALLING_PACKAGE = "calling_package";
    
    /**
     * The key to the extra in the Bundle returned by
     * android.speech.RecognizerIntent#ACTION_GET_LANGUAGE_DETAILS
+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ import android.content.res.XmlResourceParser;
import android.os.Bundle;
import android.util.AttributeSet;
import android.util.Xml;
import com.android.common.XmlUtils;

import com.android.internal.util.XmlUtils;

import java.io.IOException;

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
package android.app;

import com.android.internal.policy.PolicyManager;
import com.android.common.XmlUtils;
import com.android.internal.util.XmlUtils;
import com.google.android.collect.Maps;

import org.xmlpull.v1.XmlPullParserException;
Loading