diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-02-24 19:54:22 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-02-25 11:39:33 -0800 |
| commit | 2269d1572e5fcfb725ea55f5764d8c3280d69f6d (patch) | |
| tree | 7ce0788be6d85972d42ee7135cdce82aa323fcc7 | |
| parent | e46145f7c114b9ac6d19c6a7886e9239463f91e1 (diff) | |
| download | frameworks_base-2269d1572e5fcfb725ea55f5764d8c3280d69f6d.zip frameworks_base-2269d1572e5fcfb725ea55f5764d8c3280d69f6d.tar.gz frameworks_base-2269d1572e5fcfb725ea55f5764d8c3280d69f6d.tar.bz2 | |
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.
64 files changed, 736 insertions, 80 deletions
diff --git a/api/current.xml b/api/current.xml index 031506b..e688ab4 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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<? extends T>"> +</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<? extends T>"> +</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<? extends T>"> +</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<? extends T>"> +</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=""calling_package"" + 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=""a-zA-Z0-9\u00a0-\ud7ff\uf900-\ufdcf\ufdf0-\uffef"" + 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=""((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])"" + 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=""(?:(?: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]))"" + 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" diff --git a/common/java/com/android/common/OperationScheduler.java b/common/java/com/android/common/OperationScheduler.java index 0c7ca83..0a48fe7 100644 --- a/common/java/com/android/common/OperationScheduler.java +++ b/common/java/com/android/common/OperationScheduler.java @@ -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; diff --git a/common/java/com/android/common/speech/Recognition.java b/common/java/com/android/common/speech/Recognition.java index bf60c9a..a79a19b 100644 --- a/common/java/com/android/common/speech/Recognition.java +++ b/common/java/com/android/common/speech/Recognition.java @@ -23,15 +23,6 @@ package com.android.common.speech; * @see android.speech.RecognizerIntent */ 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 diff --git a/core/java/android/app/AliasActivity.java b/core/java/android/app/AliasActivity.java index 7527a5b..3756529 100644 --- a/core/java/android/app/AliasActivity.java +++ b/core/java/android/app/AliasActivity.java @@ -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; diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 50dcdf9..0e21936 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -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; diff --git a/core/java/android/app/SearchDialog.java b/core/java/android/app/SearchDialog.java index cb6aab6..af68689 100644 --- a/core/java/android/app/SearchDialog.java +++ b/core/java/android/app/SearchDialog.java @@ -16,8 +16,6 @@ package android.app; -import com.android.common.Patterns; -import com.android.common.speech.Recognition; import static android.app.SuggestionsAdapter.getColumnString; @@ -48,6 +46,7 @@ import android.text.TextWatcher; import android.util.AndroidRuntimeException; import android.util.AttributeSet; import android.util.Log; +import android.util.Patterns; import android.view.ContextThemeWrapper; import android.view.Gravity; import android.view.KeyEvent; @@ -820,7 +819,7 @@ public class SearchDialog extends Dialog implements OnItemClickListener, OnItemS voiceIntent.putExtra(RecognizerIntent.EXTRA_PROMPT, prompt); voiceIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, language); voiceIntent.putExtra(RecognizerIntent.EXTRA_MAX_RESULTS, maxResults); - voiceIntent.putExtra(Recognition.EXTRA_CALLING_PACKAGE, + voiceIntent.putExtra(RecognizerIntent.EXTRA_CALLING_PACKAGE, searchActivity == null ? null : searchActivity.toShortString()); // Add the values that configure forwarding the results diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 607605d..fb3f646 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -34,7 +34,8 @@ import android.os.Parcel; import android.os.Parcelable; import android.util.AttributeSet; import android.util.Log; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; import java.io.IOException; import java.io.Serializable; diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java index 023c024..452fd8a 100644 --- a/core/java/android/content/IntentFilter.java +++ b/core/java/android/content/IntentFilter.java @@ -34,7 +34,8 @@ import android.util.AndroidException; import android.util.Config; import android.util.Log; import android.util.Printer; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; /** * Structured description of Intent values to be matched. An IntentFilter can diff --git a/core/java/android/content/SyncStorageEngine.java b/core/java/android/content/SyncStorageEngine.java index fcb910d..5aad3af 100644 --- a/core/java/android/content/SyncStorageEngine.java +++ b/core/java/android/content/SyncStorageEngine.java @@ -18,7 +18,7 @@ package android.content; import com.android.internal.os.AtomicFile; import com.android.internal.util.ArrayUtils; -import com.android.common.FastXmlSerializer; +import com.android.internal.util.FastXmlSerializer; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 98aacaa..6599ae5 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -35,7 +35,8 @@ import android.util.Config; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; import java.io.File; import java.io.IOException; diff --git a/core/java/android/content/pm/RegisteredServicesCache.java b/core/java/android/content/pm/RegisteredServicesCache.java index a885820..b74c073 100644 --- a/core/java/android/content/pm/RegisteredServicesCache.java +++ b/core/java/android/content/pm/RegisteredServicesCache.java @@ -43,7 +43,7 @@ import java.io.IOException; import java.io.FileInputStream; import com.android.internal.os.AtomicFile; -import com.android.common.FastXmlSerializer; +import com.android.internal.util.FastXmlSerializer; import com.google.android.collect.Maps; import com.google.android.collect.Lists; diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index a5e39d4..0608cc0 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -17,7 +17,7 @@ package android.content.res; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/core/java/android/content/res/StringBlock.java b/core/java/android/content/res/StringBlock.java index 2411177..5e90b91 100644 --- a/core/java/android/content/res/StringBlock.java +++ b/core/java/android/content/res/StringBlock.java @@ -24,7 +24,8 @@ import android.util.SparseArray; import android.graphics.Paint; import android.graphics.Rect; import android.graphics.Typeface; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; /** * Conveniences for retrieving data out of a compiled string resource. diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index 8f0003b..a7fb31d 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -5,7 +5,8 @@ import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; import java.util.Arrays; diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java index 3c2c30a..ad1bfb2 100644 --- a/core/java/android/content/res/XmlBlock.java +++ b/core/java/android/content/res/XmlBlock.java @@ -17,7 +17,8 @@ package android.content.res; import android.util.TypedValue; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParserException; diff --git a/core/java/android/net/SSLCertificateSocketFactory.java b/core/java/android/net/SSLCertificateSocketFactory.java index f959fee..6941e57 100644 --- a/core/java/android/net/SSLCertificateSocketFactory.java +++ b/core/java/android/net/SSLCertificateSocketFactory.java @@ -16,11 +16,12 @@ package android.net; +import com.android.internal.net.DomainNameValidator; + import android.os.SystemProperties; import android.util.Config; import android.util.Log; -import com.android.common.DomainNameValidator; import java.io.IOException; import java.net.InetAddress; diff --git a/core/java/android/net/WebAddress.java b/core/java/android/net/WebAddress.java index fa13894..a572f60 100644 --- a/core/java/android/net/WebAddress.java +++ b/core/java/android/net/WebAddress.java @@ -16,7 +16,7 @@ package android.net; -import static com.android.common.Patterns.GOOD_IRI_CHAR; +import static android.util.Patterns.GOOD_IRI_CHAR; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/common/java/com/android/common/AndroidHttpClient.java b/core/java/android/net/http/AndroidHttpClient.java index 4c65eb0..3517737 100644 --- a/common/java/com/android/common/AndroidHttpClient.java +++ b/core/java/android/net/http/AndroidHttpClient.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.common; +package android.net.http; import org.apache.http.Header; import org.apache.http.HttpEntity; @@ -36,7 +36,6 @@ import org.apache.http.conn.ClientConnectionManager; import org.apache.http.conn.scheme.PlainSocketFactory; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.impl.client.RequestWrapper; import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; @@ -55,7 +54,6 @@ import java.io.OutputStream; import java.util.zip.GZIPInputStream; import java.util.zip.GZIPOutputStream; import java.net.URI; -import java.security.KeyManagementException; import android.content.Context; import android.content.ContentResolver; diff --git a/core/java/android/net/http/CertificateChainValidator.java b/core/java/android/net/http/CertificateChainValidator.java index e1327dd..c527fe4 100644 --- a/core/java/android/net/http/CertificateChainValidator.java +++ b/core/java/android/net/http/CertificateChainValidator.java @@ -16,7 +16,8 @@ package android.net.http; -import com.android.common.DomainNameValidator; + +import com.android.internal.net.DomainNameValidator; import org.apache.harmony.xnet.provider.jsse.SSLParameters; diff --git a/common/java/com/android/common/HttpDateTime.java b/core/java/android/net/http/HttpDateTime.java index f4052cc..c7a31ee 100644 --- a/common/java/com/android/common/HttpDateTime.java +++ b/core/java/android/net/http/HttpDateTime.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.common; +package android.net.http; import android.text.format.Time; @@ -22,8 +22,9 @@ import java.util.Calendar; import java.util.regex.Matcher; import java.util.regex.Pattern; - -/** {@hide} */ +/** + * Helper for parsing an HTTP date. + */ public final class HttpDateTime { /* diff --git a/core/java/android/provider/Telephony.java b/core/java/android/provider/Telephony.java index adeef54..d965962 100644 --- a/core/java/android/provider/Telephony.java +++ b/core/java/android/provider/Telephony.java @@ -29,8 +29,8 @@ import android.telephony.SmsMessage; import android.text.TextUtils; import android.util.Config; import android.util.Log; +import android.util.Patterns; -import com.android.common.Patterns; import java.util.HashSet; import java.util.Set; diff --git a/core/java/android/speech/RecognizerIntent.java b/core/java/android/speech/RecognizerIntent.java index 7c15cec..bf411e1 100644 --- a/core/java/android/speech/RecognizerIntent.java +++ b/core/java/android/speech/RecognizerIntent.java @@ -32,6 +32,15 @@ import android.os.Bundle; * Constants for supporting speech recognition through starting an {@link Intent} */ public class RecognizerIntent { + /** + * 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 final static String EXTRA_CALLING_PACKAGE = "calling_package"; + private RecognizerIntent() { // Not for instantiating. } diff --git a/core/java/android/text/AutoText.java b/core/java/android/text/AutoText.java index 862305b..04730ec 100644 --- a/core/java/android/text/AutoText.java +++ b/core/java/android/text/AutoText.java @@ -18,7 +18,9 @@ package android.text; import android.content.res.Resources; import android.content.res.XmlResourceParser; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; + import android.view.View; import org.xmlpull.v1.XmlPullParser; diff --git a/core/java/android/text/Html.java b/core/java/android/text/Html.java index 33ecc01..07e71f9 100644 --- a/core/java/android/text/Html.java +++ b/core/java/android/text/Html.java @@ -46,7 +46,8 @@ import android.text.style.TypefaceSpan; import android.text.style.URLSpan; import android.text.style.UnderlineSpan; import android.util.Log; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; import java.io.IOException; import java.io.StringReader; diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index 7f87365..9860588 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -22,10 +22,10 @@ import android.text.style.URLSpan; import android.text.Spannable; import android.text.SpannableString; import android.text.Spanned; +import android.util.Patterns; import android.webkit.WebView; import android.widget.TextView; -import com.android.common.Patterns; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/common/java/com/android/common/Patterns.java b/core/java/android/util/Patterns.java index 3b3b038..2ee6e8a 100644 --- a/common/java/com/android/common/Patterns.java +++ b/core/java/android/util/Patterns.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.common; +package android.util; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/java/android/util/TimeUtils.java b/core/java/android/util/TimeUtils.java index 4f496d7..0fc70d5 100644 --- a/core/java/android/util/TimeUtils.java +++ b/core/java/android/util/TimeUtils.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.util.TimeZone; import java.util.Date; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; /** * A class containing utility methods related to time zones. diff --git a/core/java/android/util/XmlPullAttributes.java b/core/java/android/util/XmlPullAttributes.java index 8f855cd..ecedbe1 100644 --- a/core/java/android/util/XmlPullAttributes.java +++ b/core/java/android/util/XmlPullAttributes.java @@ -19,7 +19,8 @@ package android.util; import org.xmlpull.v1.XmlPullParser; import android.util.AttributeSet; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; /** * Provides an implementation of AttributeSet on top of an XmlPullParser. diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 87cab3c..647556b 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -18,6 +18,7 @@ package android.webkit; import android.content.Context; import android.net.http.Headers; +import android.net.http.HttpDateTime; import android.os.FileUtils; import android.util.Log; import java.io.File; @@ -30,7 +31,6 @@ import java.io.OutputStream; import java.util.ArrayList; import java.util.Map; -import com.android.common.HttpDateTime; import org.bouncycastle.crypto.Digest; import org.bouncycastle.crypto.digests.SHA1Digest; diff --git a/core/java/android/webkit/CookieManager.java b/core/java/android/webkit/CookieManager.java index 84e34bc..1d28731 100644 --- a/core/java/android/webkit/CookieManager.java +++ b/core/java/android/webkit/CookieManager.java @@ -18,9 +18,9 @@ package android.webkit; import android.net.ParseException; import android.net.WebAddress; +import android.net.http.HttpDateTime; import android.util.Log; -import com.android.common.HttpDateTime; import java.util.ArrayList; import java.util.Arrays; diff --git a/common/java/com/android/common/DNParser.java b/core/java/com/android/internal/net/DNParser.java index 32d57c0..5254207 100644 --- a/common/java/com/android/common/DNParser.java +++ b/core/java/com/android/internal/net/DNParser.java @@ -15,7 +15,8 @@ * limitations under the License. */ -package com.android.common; +package com.android.internal.net; + import android.util.Log; @@ -34,6 +35,8 @@ import javax.security.auth.x500.X500Principal; * * <p>This class is used by {@link DomainNameValidator} only. However, in order to make this * class visible from unit tests, it's made public. + * + * @hide */ public final class DNParser { private static final String TAG = "DNParser"; diff --git a/common/java/com/android/common/DomainNameValidator.java b/core/java/com/android/internal/net/DomainNameValidator.java index 25dc007..dbd5019 100644 --- a/common/java/com/android/common/DomainNameValidator.java +++ b/core/java/com/android/internal/net/DomainNameValidator.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.common; +package com.android.internal.net; + import android.util.Config; import android.util.Log; @@ -30,6 +31,7 @@ import java.util.regex.PatternSyntaxException; import javax.security.auth.x500.X500Principal; +/** @hide */ public class DomainNameValidator { private final static String TAG = "DomainNameValidator"; diff --git a/core/java/com/android/internal/os/PowerProfile.java b/core/java/com/android/internal/os/PowerProfile.java index 9e5bdff..2369d25 100644 --- a/core/java/com/android/internal/os/PowerProfile.java +++ b/core/java/com/android/internal/os/PowerProfile.java @@ -20,7 +20,7 @@ package com.android.internal.os; import android.content.Context; import android.content.res.XmlResourceParser; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/common/java/com/android/common/FastXmlSerializer.java b/core/java/com/android/internal/util/FastXmlSerializer.java index 0d33941..592a8fa 100644 --- a/common/java/com/android/common/FastXmlSerializer.java +++ b/core/java/com/android/internal/util/FastXmlSerializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.common; +package com.android.internal.util; import org.xmlpull.v1.XmlSerializer; diff --git a/common/java/com/android/common/XmlUtils.java b/core/java/com/android/internal/util/XmlUtils.java index dd57e49..8d8df16 100644 --- a/common/java/com/android/common/XmlUtils.java +++ b/core/java/com/android/internal/util/XmlUtils.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package com.android.common; +package com.android.internal.util; + import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 1fb9852..b0e2843 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -9,6 +9,8 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ src/android/os/IAidlTest.aidl +LOCAL_STATIC_JAVA_LIBRARIES += android-common + LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreTests diff --git a/location/java/com/android/internal/location/GpsXtraDownloader.java b/location/java/com/android/internal/location/GpsXtraDownloader.java index 02a9f48..978bda2 100644 --- a/location/java/com/android/internal/location/GpsXtraDownloader.java +++ b/location/java/com/android/internal/location/GpsXtraDownloader.java @@ -32,10 +32,10 @@ import java.util.Random; import android.content.Context; import android.net.Proxy; +import android.net.http.AndroidHttpClient; import android.util.Config; import android.util.Log; -import com.android.common.AndroidHttpClient; /** diff --git a/mms-common/Android.mk b/mms-common/Android.mk index de994c0..57f1ccc 100644 --- a/mms-common/Android.mk +++ b/mms-common/Android.mk @@ -20,6 +20,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := mms-common LOCAL_SRC_FILES := $(call all-java-files-under, java) +LOCAL_STATIC_JAVA_LIBRARIES += android-common include $(BUILD_STATIC_JAVA_LIBRARY) # Include this library in the build server's output directory diff --git a/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java b/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java index 0237bc2..87e4758 100644 --- a/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java +++ b/mms-common/java/com/android/mmscommon/telephony/TelephonyProvider.java @@ -32,8 +32,8 @@ import android.telephony.SmsMessage; import android.text.TextUtils; import android.util.Config; import android.util.Log; +import android.util.Patterns; -import com.android.common.Patterns; import android.database.sqlite.SqliteWrapper; /** diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 8036e52..18e247e 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -44,8 +44,8 @@ import android.text.TextUtils; import android.util.Config; import android.util.Log; import android.util.Xml; -import com.android.common.XmlUtils; import com.android.internal.telephony.RILConstants; +import com.android.internal.util.XmlUtils; import com.android.internal.widget.LockPatternUtils; import com.android.internal.widget.LockPatternView; diff --git a/preloaded-classes b/preloaded-classes index aaae440..9fc000f 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -308,10 +308,12 @@ android.net.Uri$HierarchicalUri android.net.Uri$OpaqueUri android.net.Uri$Part android.net.WebAddress +android.net.http.AndroidHttpClient android.net.http.AndroidHttpClientConnection android.net.http.EventHandler android.net.http.Headers android.net.http.HttpsConnection +android.net.http.HttpDateTime android.net.http.Request android.net.http.RequestQueue android.net.http.SslCertificate @@ -473,6 +475,7 @@ android.util.FloatMath android.util.Log android.util.LongSparseArray android.util.MonthDisplayHelper +android.util.Patterns android.util.SparseArray android.util.StateSet android.util.TypedValue @@ -618,13 +621,6 @@ android.widget.ViewSwitcher android.widget.ZoomButton android.widget.ZoomButtonsController android.widget.ZoomControls -com.android.common.AndroidHttpClient -com.android.common.DomainNameValidator -com.android.common.FastXmlSerializer -com.android.common.HttpDateTime -com.android.common.Patterns -com.android.common.Rfc822Validator -com.android.common.userhappiness.UserHappinessSignals com.android.internal.R$styleable com.android.internal.app.AlertActivity com.android.internal.app.AlertController @@ -652,6 +648,7 @@ com.android.internal.os.SamplingProfilerIntegration com.android.internal.os.ZygoteConnection com.android.internal.os.ZygoteConnection$Arguments com.android.internal.os.ZygoteInit +com.android.internal.net.DomainNameValidator com.android.internal.policy.PolicyManager com.android.internal.policy.impl.PhoneLayoutInflater com.android.internal.policy.impl.PhoneWindow @@ -672,7 +669,9 @@ com.android.internal.telephony.gsm.SmsMessage com.android.internal.telephony.gsm.SmsMessage$PduParser com.android.internal.util.ArrayUtils com.android.internal.util.FastMath +com.android.internal.util.FastXmlSerializer com.android.internal.util.HanziToPinyin +com.android.internal.util.XmlUtils com.android.internal.view.IInputConnectionWrapper com.android.internal.view.IInputContext$Stub com.android.internal.view.IInputMethodManager$Stub diff --git a/sax/tests/saxtests/src/android/sax/SafeSaxTest.java b/sax/tests/saxtests/src/android/sax/SafeSaxTest.java index bee3938..e8cf2f7 100644 --- a/sax/tests/saxtests/src/android/sax/SafeSaxTest.java +++ b/sax/tests/saxtests/src/android/sax/SafeSaxTest.java @@ -29,7 +29,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.text.format.Time; import android.util.Log; import android.util.Xml; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index 0b466f1..a5b0db9 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -57,7 +57,7 @@ import java.util.HashSet; import com.android.internal.appwidget.IAppWidgetService; import com.android.internal.appwidget.IAppWidgetHost; -import com.android.common.FastXmlSerializer; +import com.android.internal.util.FastXmlSerializer; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/services/java/com/android/server/DevicePolicyManagerService.java b/services/java/com/android/server/DevicePolicyManagerService.java index ac65aa9..9899e99 100644 --- a/services/java/com/android/server/DevicePolicyManagerService.java +++ b/services/java/com/android/server/DevicePolicyManagerService.java @@ -16,9 +16,9 @@ package com.android.server; -import com.android.common.FastXmlSerializer; -import com.android.common.XmlUtils; import com.android.internal.content.PackageMonitor; +import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.XmlUtils; import com.android.internal.widget.LockPatternUtils; import org.xmlpull.v1.XmlPullParser; diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java index 2640cfb..1bb897b 100644 --- a/services/java/com/android/server/KeyInputQueue.java +++ b/services/java/com/android/server/KeyInputQueue.java @@ -32,7 +32,7 @@ import android.view.RawInputEvent; import android.view.Surface; import android.view.WindowManagerPolicy; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import org.xmlpull.v1.XmlPullParser; diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index a23fac4..63fdaef 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -18,9 +18,9 @@ package com.android.server; import com.android.internal.app.IMediaContainerService; import com.android.internal.app.ResolverActivity; -import com.android.common.FastXmlSerializer; -import com.android.common.XmlUtils; import com.android.internal.content.PackageHelper; +import com.android.internal.util.FastXmlSerializer; +import com.android.internal.util.XmlUtils; import com.android.server.JournaledFile; import org.xmlpull.v1.XmlPullParser; diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 481e6a4..aebb0ff 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -67,9 +67,9 @@ import org.xmlpull.v1.XmlSerializer; import com.android.internal.content.PackageMonitor; import com.android.internal.service.wallpaper.ImageWallpaper; +import com.android.internal.util.FastXmlSerializer; import com.android.server.DevicePolicyManagerService.ActiveAdmin; import com.android.server.DevicePolicyManagerService.MyPackageMonitor; -import com.android.common.FastXmlSerializer; class WallpaperManagerService extends IWallpaperManager.Stub { static final String TAG = "WallpaperService"; diff --git a/telephony/java/com/android/internal/telephony/IccProvider.java b/telephony/java/com/android/internal/telephony/IccProvider.java index 4232887..fa91457 100644 --- a/telephony/java/com/android/internal/telephony/IccProvider.java +++ b/telephony/java/com/android/internal/telephony/IccProvider.java @@ -19,8 +19,9 @@ package com.android.internal.telephony; import android.content.ContentProvider; import android.content.UriMatcher; import android.content.ContentValues; -import com.android.common.ArrayListCursor; +import android.database.AbstractCursor; import android.database.Cursor; +import android.database.CursorWindow; import android.net.Uri; import android.os.SystemProperties; import android.os.RemoteException; @@ -35,6 +36,149 @@ import com.android.internal.telephony.IccConstants; import com.android.internal.telephony.AdnRecord; import com.android.internal.telephony.IIccPhoneBook; +/** + * XXX old code -- should be replaced with MatrixCursor. + * @deprecated This is has been replaced by MatrixCursor. +*/ +class ArrayListCursor extends AbstractCursor { + private String[] mColumnNames; + private ArrayList<Object>[] mRows; + + @SuppressWarnings({"unchecked"}) + public ArrayListCursor(String[] columnNames, ArrayList<ArrayList> rows) { + int colCount = columnNames.length; + boolean foundID = false; + // Add an _id column if not in columnNames + for (int i = 0; i < colCount; ++i) { + if (columnNames[i].compareToIgnoreCase("_id") == 0) { + mColumnNames = columnNames; + foundID = true; + break; + } + } + + if (!foundID) { + mColumnNames = new String[colCount + 1]; + System.arraycopy(columnNames, 0, mColumnNames, 0, columnNames.length); + mColumnNames[colCount] = "_id"; + } + + int rowCount = rows.size(); + mRows = new ArrayList[rowCount]; + + for (int i = 0; i < rowCount; ++i) { + mRows[i] = rows.get(i); + if (!foundID) { + mRows[i].add(i); + } + } + } + + @Override + public void fillWindow(int position, CursorWindow window) { + if (position < 0 || position > getCount()) { + return; + } + + window.acquireReference(); + try { + int oldpos = mPos; + mPos = position - 1; + window.clear(); + window.setStartPosition(position); + int columnNum = getColumnCount(); + window.setNumColumns(columnNum); + while (moveToNext() && window.allocRow()) { + for (int i = 0; i < columnNum; i++) { + final Object data = mRows[mPos].get(i); + if (data != null) { + if (data instanceof byte[]) { + byte[] field = (byte[]) data; + if (!window.putBlob(field, mPos, i)) { + window.freeLastRow(); + break; + } + } else { + String field = data.toString(); + if (!window.putString(field, mPos, i)) { + window.freeLastRow(); + break; + } + } + } else { + if (!window.putNull(mPos, i)) { + window.freeLastRow(); + break; + } + } + } + } + + mPos = oldpos; + } catch (IllegalStateException e){ + // simply ignore it + } finally { + window.releaseReference(); + } + } + + @Override + public int getCount() { + return mRows.length; + } + + @Override + public String[] getColumnNames() { + return mColumnNames; + } + + @Override + public byte[] getBlob(int columnIndex) { + return (byte[]) mRows[mPos].get(columnIndex); + } + + @Override + public String getString(int columnIndex) { + Object cell = mRows[mPos].get(columnIndex); + return (cell == null) ? null : cell.toString(); + } + + @Override + public short getShort(int columnIndex) { + Number num = (Number) mRows[mPos].get(columnIndex); + return num.shortValue(); + } + + @Override + public int getInt(int columnIndex) { + Number num = (Number) mRows[mPos].get(columnIndex); + return num.intValue(); + } + + @Override + public long getLong(int columnIndex) { + Number num = (Number) mRows[mPos].get(columnIndex); + return num.longValue(); + } + + @Override + public float getFloat(int columnIndex) { + Number num = (Number) mRows[mPos].get(columnIndex); + return num.floatValue(); + } + + @Override + public double getDouble(int columnIndex) { + Number num = (Number) mRows[mPos].get(columnIndex); + return num.doubleValue(); + } + + @Override + public boolean isNull(int columnIndex) { + return mRows[mPos].get(columnIndex) == null; + } +} + /** * {@hide} diff --git a/telephony/java/com/android/internal/telephony/cdma/EriManager.java b/telephony/java/com/android/internal/telephony/cdma/EriManager.java index 0e186d0..37c1d55 100644 --- a/telephony/java/com/android/internal/telephony/cdma/EriManager.java +++ b/telephony/java/com/android/internal/telephony/cdma/EriManager.java @@ -23,8 +23,8 @@ import android.util.Xml; import com.android.internal.telephony.Phone; import com.android.internal.telephony.PhoneBase; +import com.android.internal.util.XmlUtils; -import com.android.common.XmlUtils; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; diff --git a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java index 905d5e3..d893ec4 100644 --- a/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java +++ b/telephony/java/com/android/internal/telephony/gsm/GsmDataConnection.java @@ -18,8 +18,8 @@ package com.android.internal.telephony.gsm; import android.os.Message; import android.util.Log; +import android.util.Patterns; -import com.android.common.Patterns; import com.android.internal.telephony.DataConnection; import com.android.internal.telephony.Phone; import com.android.internal.telephony.RILConstants; diff --git a/telephony/java/com/android/internal/telephony/gsm/SpnOverride.java b/telephony/java/com/android/internal/telephony/gsm/SpnOverride.java index abb0230..9ea30101 100644 --- a/telephony/java/com/android/internal/telephony/gsm/SpnOverride.java +++ b/telephony/java/com/android/internal/telephony/gsm/SpnOverride.java @@ -13,7 +13,7 @@ import android.os.Environment; import android.util.Log; import android.util.Xml; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; public class SpnOverride { private HashMap<String, String> CarrierSpnMap; diff --git a/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java b/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java index 0bedd53..0e49e35 100644 --- a/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java +++ b/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java @@ -28,7 +28,8 @@ import java.io.IOException; import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; -import com.android.common.XmlUtils; + +import com.android.internal.util.XmlUtils; /** * {@hide} diff --git a/common/tests/res/raw/alt_ip_only.crt b/tests/AndroidTests/res/raw/alt_ip_only.crt index 3ac9f5a..3ac9f5a 100644 --- a/common/tests/res/raw/alt_ip_only.crt +++ b/tests/AndroidTests/res/raw/alt_ip_only.crt diff --git a/common/tests/res/raw/subject_alt_only.crt b/tests/AndroidTests/res/raw/subject_alt_only.crt index d5808fb..d5808fb 100644 --- a/common/tests/res/raw/subject_alt_only.crt +++ b/tests/AndroidTests/res/raw/subject_alt_only.crt diff --git a/common/tests/res/raw/subject_only.crt b/tests/AndroidTests/res/raw/subject_only.crt index 11b34e7..11b34e7 100644 --- a/common/tests/res/raw/subject_only.crt +++ b/tests/AndroidTests/res/raw/subject_only.crt diff --git a/common/tests/res/raw/subject_with_alt_names.crt b/tests/AndroidTests/res/raw/subject_with_alt_names.crt index 6963c7e..6963c7e 100644 --- a/common/tests/res/raw/subject_with_alt_names.crt +++ b/tests/AndroidTests/res/raw/subject_with_alt_names.crt diff --git a/common/tests/res/raw/subject_with_wild_alt_name.crt b/tests/AndroidTests/res/raw/subject_with_wild_alt_name.crt index 19b1174..19b1174 100644 --- a/common/tests/res/raw/subject_with_wild_alt_name.crt +++ b/tests/AndroidTests/res/raw/subject_with_wild_alt_name.crt diff --git a/common/tests/res/raw/wild_alt_name_only.crt b/tests/AndroidTests/res/raw/wild_alt_name_only.crt index fafdebf..fafdebf 100644 --- a/common/tests/res/raw/wild_alt_name_only.crt +++ b/tests/AndroidTests/res/raw/wild_alt_name_only.crt diff --git a/common/tests/src/com/android/common/DNParserTest.java b/tests/AndroidTests/src/com/android/unit_tests/DNParserTest.java index 34b140a..61d0b42 100644 --- a/common/tests/src/com/android/common/DNParserTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/DNParserTest.java @@ -13,7 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.common; +package com.android.unit_tests; + +import com.android.internal.net.DNParser; import javax.security.auth.x500.X500Principal; diff --git a/common/tests/src/com/android/common/DomainNameValidatorTest.java b/tests/AndroidTests/src/com/android/unit_tests/DomainNameValidatorTest.java index b825be4..1754dbe 100644 --- a/common/tests/src/com/android/common/DomainNameValidatorTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/DomainNameValidatorTest.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.common; +package com.android.unit_tests; -import com.android.common.tests.R; +import com.android.internal.net.DomainNameValidator; import android.test.AndroidTestCase; diff --git a/common/tests/src/com/android/common/PatternsTest.java b/tests/AndroidTests/src/com/android/unit_tests/PatternsTest.java index 9e2ad58..0edcd6d 100644 --- a/common/tests/src/com/android/common/PatternsTest.java +++ b/tests/AndroidTests/src/com/android/unit_tests/PatternsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 The Android Open Source Project + * Copyright (C) 2010 The Android Open Source Project * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -package com.android.common; +package com.android.unit_tests; import android.test.suitebuilder.annotation.SmallTest; -import junit.framework.TestCase; +import android.util.Patterns; import java.util.regex.Matcher; -import java.util.regex.Pattern; + +import junit.framework.TestCase; public class PatternsTest extends TestCase { diff --git a/tests/SslLoad/src/com/android/sslload/SslLoad.java b/tests/SslLoad/src/com/android/sslload/SslLoad.java index 1470d48..62aa524 100644 --- a/tests/SslLoad/src/com/android/sslload/SslLoad.java +++ b/tests/SslLoad/src/com/android/sslload/SslLoad.java @@ -35,7 +35,7 @@ import android.view.View.OnClickListener; import android.widget.Button; import android.widget.TextView; import android.util.Log; -import com.android.common.AndroidHttpClient; +import android.net.http.AndroidHttpClient; import org.apache.http.client.HttpClient; import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.HttpGet; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java index 41d9f9d..8e9e75f 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/Bridge.java @@ -16,7 +16,7 @@ package com.android.layoutlib.bridge; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import com.android.layoutlib.api.ILayoutBridge; import com.android.layoutlib.api.ILayoutLog; import com.android.layoutlib.api.ILayoutResult; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java index 6a98780..70c5bd7 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/BridgeTypedArray.java @@ -16,7 +16,7 @@ package com.android.layoutlib.bridge; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; import com.android.layoutlib.api.IResourceValue; import com.android.layoutlib.api.IStyleResourceValue; |