From 2269d1572e5fcfb725ea55f5764d8c3280d69f6d Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 24 Feb 2010 19:54:22 -0800 Subject: [PATCH] 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. --- api/current.xml | 489 ++++++++++++++++++ .../android/common/OperationScheduler.java | 1 + .../android/common/speech/Recognition.java | 9 - core/java/android/app/AliasActivity.java | 3 +- core/java/android/app/ContextImpl.java | 2 +- core/java/android/app/SearchDialog.java | 5 +- core/java/android/content/Intent.java | 3 +- core/java/android/content/IntentFilter.java | 3 +- .../android/content/SyncStorageEngine.java | 2 +- .../android/content/pm/PackageParser.java | 3 +- .../content/pm/RegisteredServicesCache.java | 2 +- core/java/android/content/res/Resources.java | 2 +- .../java/android/content/res/StringBlock.java | 3 +- core/java/android/content/res/TypedArray.java | 3 +- core/java/android/content/res/XmlBlock.java | 3 +- .../net/SSLCertificateSocketFactory.java | 3 +- core/java/android/net/WebAddress.java | 2 +- .../android/net/http}/AndroidHttpClient.java | 4 +- .../net/http/CertificateChainValidator.java | 3 +- .../java/android/net/http}/HttpDateTime.java | 7 +- core/java/android/provider/Telephony.java | 2 +- .../java/android/speech/RecognizerIntent.java | 9 + core/java/android/text/AutoText.java | 4 +- core/java/android/text/Html.java | 3 +- core/java/android/text/util/Linkify.java | 2 +- .../java/android/util}/Patterns.java | 2 +- core/java/android/util/TimeUtils.java | 2 +- core/java/android/util/XmlPullAttributes.java | 3 +- core/java/android/webkit/CacheManager.java | 2 +- core/java/android/webkit/CookieManager.java | 2 +- .../com/android/internal/net}/DNParser.java | 5 +- .../internal/net}/DomainNameValidator.java | 4 +- .../com/android/internal/os/PowerProfile.java | 2 +- .../internal/util}/FastXmlSerializer.java | 2 +- .../com/android/internal/util}/XmlUtils.java | 3 +- core/tests/coretests/Android.mk | 2 + .../internal/location/GpsXtraDownloader.java | 2 +- mms-common/Android.mk | 1 + .../telephony/TelephonyProvider.java | 2 +- .../providers/settings/DatabaseHelper.java | 2 +- preloaded-classes | 13 +- .../saxtests/src/android/sax/SafeSaxTest.java | 2 +- .../com/android/server/AppWidgetService.java | 2 +- .../server/DevicePolicyManagerService.java | 4 +- .../com/android/server/KeyInputQueue.java | 2 +- .../android/server/PackageManagerService.java | 4 +- .../server/WallpaperManagerService.java | 2 +- .../internal/telephony/IccProvider.java | 146 +++++- .../internal/telephony/cdma/EriManager.java | 2 +- .../telephony/gsm/GsmDataConnection.java | 2 +- .../internal/telephony/gsm/SpnOverride.java | 2 +- .../telephony/gsm/VoiceMailConstants.java | 3 +- .../AndroidTests}/res/raw/alt_ip_only.crt | 0 .../res/raw/subject_alt_only.crt | 0 .../AndroidTests}/res/raw/subject_only.crt | 0 .../res/raw/subject_with_alt_names.crt | 0 .../res/raw/subject_with_wild_alt_name.crt | 0 .../res/raw/wild_alt_name_only.crt | 0 .../com/android/unit_tests}/DNParserTest.java | 4 +- .../unit_tests}/DomainNameValidatorTest.java | 4 +- .../com/android/unit_tests}/PatternsTest.java | 10 +- .../src/com/android/sslload/SslLoad.java | 2 +- .../com/android/layoutlib/bridge/Bridge.java | 2 +- .../layoutlib/bridge/BridgeTypedArray.java | 2 +- 64 files changed, 736 insertions(+), 80 deletions(-) rename {common/java/com/android/common => core/java/android/net/http}/AndroidHttpClient.java (99%) rename {common/java/com/android/common => core/java/android/net/http}/HttpDateTime.java (99%) rename {common/java/com/android/common => core/java/android/util}/Patterns.java (99%) rename {common/java/com/android/common => core/java/com/android/internal/net}/DNParser.java (99%) rename {common/java/com/android/common => core/java/com/android/internal/net}/DomainNameValidator.java (99%) rename {common/java/com/android/common => core/java/com/android/internal/util}/FastXmlSerializer.java (99%) rename {common/java/com/android/common => core/java/com/android/internal/util}/XmlUtils.java (99%) rename {common/tests => tests/AndroidTests}/res/raw/alt_ip_only.crt (100%) rename {common/tests => tests/AndroidTests}/res/raw/subject_alt_only.crt (100%) rename {common/tests => tests/AndroidTests}/res/raw/subject_only.crt (100%) rename {common/tests => tests/AndroidTests}/res/raw/subject_with_alt_names.crt (100%) rename {common/tests => tests/AndroidTests}/res/raw/subject_with_wild_alt_name.crt (100%) rename {common/tests => tests/AndroidTests}/res/raw/wild_alt_name_only.crt (100%) rename {common/tests/src/com/android/common => tests/AndroidTests/src/com/android/unit_tests}/DNParserTest.java (96%) rename {common/tests/src/com/android/common => tests/AndroidTests/src/com/android/unit_tests}/DomainNameValidatorTest.java (99%) rename {common/tests/src/com/android/common => tests/AndroidTests/src/com/android/unit_tests}/PatternsTest.java (97%) diff --git a/api/current.xml b/api/current.xml index 031506b558e..e688ab4a9d2 100644 --- a/api/current.xml +++ b/api/current.xml @@ -89978,6 +89978,356 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 similarity index 99% rename from common/java/com/android/common/DomainNameValidator.java rename to core/java/com/android/internal/net/DomainNameValidator.java index 25dc007f751..dbd50194ae2 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 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 9e5bdff59bd..2369d25bd47 100644 --- a/core/java/com/android/internal/os/PowerProfile.java +++ b/core/java/com/android/internal/os/PowerProfile.java @@ -20,7 +20,7 @@ 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 similarity index 99% rename from common/java/com/android/common/FastXmlSerializer.java rename to core/java/com/android/internal/util/FastXmlSerializer.java index 0d339413ad9..592a8facc7f 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 similarity index 99% rename from common/java/com/android/common/XmlUtils.java rename to core/java/com/android/internal/util/XmlUtils.java index dd57e4998ce..8d8df16df70 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 1fb98529b26..b0e28430e58 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 02a9f482800..978bda2193a 100644 --- a/location/java/com/android/internal/location/GpsXtraDownloader.java +++ b/location/java/com/android/internal/location/GpsXtraDownloader.java @@ -32,10 +32,10 @@ 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 de994c0cd22..57f1ccca08b 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 0237bc2eb69..87e47583e1d 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.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 8036e5225e8..18e247e7984 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.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 aaae4408d03..9fc000f6091 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 bee393863df..e8cf2f748c8 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.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 0b466f1002f..a5b0db9a10b 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -57,7 +57,7 @@ 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 ac65aa98574..9899e990241 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 2640cfb2249..1bb897b7042 100644 --- a/services/java/com/android/server/KeyInputQueue.java +++ b/services/java/com/android/server/KeyInputQueue.java @@ -32,7 +32,7 @@ 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 a23fac4450b..63fdaef3d4a 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -18,9 +18,9 @@ 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 481e6a43cfb..aebb0ff9522 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -67,9 +67,9 @@ 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 42328871d8d..fa914570c34 100644 --- a/telephony/java/com/android/internal/telephony/IccProvider.java +++ b/telephony/java/com/android/internal/telephony/IccProvider.java @@ -19,8 +19,9 @@ 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.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[] mRows; + + @SuppressWarnings({"unchecked"}) + public ArrayListCursor(String[] columnNames, 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 0e186d02516..37c1d55eec4 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 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 905d5e3abbd..d893ec4c483 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 @@ 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 abb0230acf6..9ea3010197a 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.util.Log; import android.util.Xml; -import com.android.common.XmlUtils; +import com.android.internal.util.XmlUtils; public class SpnOverride { private HashMap CarrierSpnMap; diff --git a/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java b/telephony/java/com/android/internal/telephony/gsm/VoiceMailConstants.java index 0bedd53f4e4..0e49e357abf 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 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 similarity index 100% rename from common/tests/res/raw/alt_ip_only.crt rename to 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 similarity index 100% rename from common/tests/res/raw/subject_alt_only.crt rename to 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 similarity index 100% rename from common/tests/res/raw/subject_only.crt rename to 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 similarity index 100% rename from common/tests/res/raw/subject_with_alt_names.crt rename to 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 similarity index 100% rename from common/tests/res/raw/subject_with_wild_alt_name.crt rename to 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 similarity index 100% rename from common/tests/res/raw/wild_alt_name_only.crt rename to 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 similarity index 96% rename from common/tests/src/com/android/common/DNParserTest.java rename to tests/AndroidTests/src/com/android/unit_tests/DNParserTest.java index 34b140a0e6c..61d0b429815 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 similarity index 99% rename from common/tests/src/com/android/common/DomainNameValidatorTest.java rename to tests/AndroidTests/src/com/android/unit_tests/DomainNameValidatorTest.java index b825be4ac92..1754dbe2818 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 similarity index 97% rename from common/tests/src/com/android/common/PatternsTest.java rename to tests/AndroidTests/src/com/android/unit_tests/PatternsTest.java index 9e2ad588bdf..0edcd6d10d3 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 1470d48f1d8..62aa524dc45 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.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 41d9f9dde5a..8e9e75f9bb9 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 6a98780c7f3..70c5bd72483 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;