Merge "FileSystemPermissionTest: add one dir" into gingerbread
diff --git a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
old mode 100644
new mode 100755
index 34e0eb1..5df3739
--- a/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
+++ b/tests/tests/content/src/android/content/cts/AvailableIntentsTest.java
@@ -187,21 +187,6 @@
assertCanBeHandled(intent);
}
- /**
- * Test launch inbox view of Mms application
- */
- public void testViewMessageInbox() {
- PackageManager packageManager = mContext.getPackageManager();
- if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
- Intent intent = new Intent(Intent.ACTION_MAIN);
- intent.setType("vnd.android.cursor.dir/mms");
- assertCanBeHandled(intent);
-
- intent.setType("vnd.android-dir/mms-sms");
- assertCanBeHandled(intent);
- }
- }
-
public void testAlarmClock() {
Intent intent = new Intent(AlarmClock.ACTION_SET_ALARM);
intent.putExtra(AlarmClock.EXTRA_MESSAGE, "Custom message");
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index dc8e8b7..39a2c5e 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -1880,12 +1880,12 @@
mTextView.getFocusedRect(rc);
assertNotNull(mTextView.getLayout());
assertEquals(mTextView.getLayout().getPrimaryHorizontal(13),
- (float) rc.left, 0.4f);
+ (float) rc.left, 0.8f);
// 'right' is one pixel larger than 'left'
assertEquals(mTextView.getLayout().getPrimaryHorizontal(13) + 1,
- (float) rc.right, 0.4f);
+ (float) rc.right, 0.8f);
assertEquals(mTextView.getLayout().getLineTop(0), rc.top);
- assertEquals(mTextView.getLayout().getLineBottom(0), rc.bottom, 0.4f);
+ assertEquals(mTextView.getLayout().getLineBottom(0), rc.bottom, 0.8f);
// Exception
try {