am e0e64bd8: Merge "Merge remote branch \'korg/froyo\' into froyomerge" into gingerbread

* commit 'e0e64bd8301cee40c88c2d453799e0d13f08656a': (33 commits)
  Using different filenames for testRecorderVideo and testRecorderCamera.
  Remove Reference to Internal Phone Constant
  Change test string without a space character
  The test branches to alphabetic or numeric one
  Add key strokes in case of using 12-key keyboad
  Appends a space instead of using POUND key
  Update startcts Script
  Add QHD to the supported ScreenConfiguration list
  Add wait to testCacheFile.
  Adding waitForIdleSync in testTouchMode.
  Fix OpenGlEsVersionTest
  Fix OpenGlEsVersionTest
  Stop WifiManagerTest from disabling current network.
  Verify preinstalled apps don't have debuggable set.
  Remove isWatchingCursor Assertion
  Backport TelephonyManagerTest Enhancements
  FileSystemPermissionTest Eclair Backport
  Eclair CTS Version Increment to 2.1_r5
  Fix Eclair ARMEABI Test
  Read Log Permission Test Fixes
  ...

tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java

@@ -16,8 +16,6 @@
 
 package android.net.cts;
 
-import com.android.internal.telephony.Phone;
-
 import dalvik.annotation.TestLevel;
 import dalvik.annotation.TestTargetClass;
 import dalvik.annotation.TestTargetNew;
@@ -233,7 +231,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
             fail("Broadcast receiver waiting for ConnectivityManager interrupted.");
         } finally {
             mCm.stopUsingNetworkFeature(ConnectivityManager.TYPE_MOBILE,
-                    Phone.FEATURE_ENABLE_HIPRI);
+                    FEATURE_ENABLE_HIPRI);
             if (!isWifiConnected) {
                 mWifiManager.setWifiEnabled(false);
             }