am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo
Merge commit '2859b6f20e5e9941d5d8062f328cd42c61925be6' into froyo
* commit '2859b6f20e5e9941d5d8062f328cd42c61925be6':
DO NOT MERGE Check "hardware_id" Property
diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index 086397a..8044752 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -22,8 +22,6 @@
import junit.framework.TestCase;
-import java.util.regex.Pattern;
-
@TestTargetClass(Build.class)
public class BuildTest extends TestCase {
@@ -48,12 +46,4 @@
assertEquals(message, "unknown", Build.CPU_ABI2);
}
}
-
- private static final Pattern DEVICE_PATTERN =
- Pattern.compile("^([0-9a-z_]+)$");
-
- /** Tests that check for valid values of constants in Build. */
- public void testBuildConstants() {
- assertTrue(DEVICE_PATTERN.matcher(Build.DEVICE).matches());
- }
}
diff --git a/tests/tests/provider/src/android/provider/cts/SettingsTest.java b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
index e3ca242..73fd836 100644
--- a/tests/tests/provider/src/android/provider/cts/SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/SettingsTest.java
@@ -28,10 +28,10 @@
import android.os.RemoteException;
import android.provider.Settings;
import android.test.AndroidTestCase;
+import android.util.Log;
@TestTargetClass(android.provider.Settings.class)
public class SettingsTest extends AndroidTestCase {
-
public void testSystemTable() throws RemoteException {
final String[] SYSTEM_PROJECTION = new String[] {
Settings.System._ID, Settings.System.NAME, Settings.System.VALUE
diff --git a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
index a1d6432..239b3e5 100644
--- a/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/src/android/telephony/cts/TelephonyManagerTest.java
@@ -21,14 +21,11 @@
import dalvik.annotation.TestTargetNew;
import dalvik.annotation.TestTargets;
-import android.content.ContentResolver;
import android.content.Context;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
-import android.os.Build;
import android.os.Looper;
import android.os.cts.TestThread;
-import android.provider.Settings;
import android.telephony.CellLocation;
import android.telephony.PhoneStateListener;
import android.telephony.TelephonyManager;
@@ -297,7 +294,6 @@
case TelephonyManager.PHONE_TYPE_NONE:
assertNull(deviceId);
- assertHardwareId();
assertMacAddressReported();
break;
@@ -380,17 +376,6 @@
Pattern.matches(meidPattern, deviceId));
}
- private void assertHardwareId() {
- ContentResolver resolver = mContext.getContentResolver();
- String hardwareId = Settings.Secure.getString(resolver, "hardware_id");
- assertNotNull("Non-telephony devices must define a Settings.Secure 'hardware_id' property.",
- hardwareId);
- assertTrue("Hardware id must be no longer than 20 characters.",
- hardwareId.length() <= 20);
- assertTrue("Hardware id must be alphanumeric.",
- Pattern.matches("[0-9A-Za-z]+", hardwareId));
- }
-
private void assertMacAddressReported() {
String macAddress = getMacAddress();
String macPattern = "([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}";
diff --git a/tools/host/src/com/android/cts/Version.java b/tools/host/src/com/android/cts/Version.java
index 5f07e00..fead909 100644
--- a/tools/host/src/com/android/cts/Version.java
+++ b/tools/host/src/com/android/cts/Version.java
@@ -18,12 +18,12 @@
public class Version {
// The CTS version string
- private static final String version = "2.2_r2";
-
+ private static final String version = "2.2_r1";
+
private Version() {
// no instances allowed
}
-
+
public static String asString() {
return version;
}