am 3002bb4e: Merge "Fix AnimationTest#testSetAnimationListener" into jb-dev
* commit '3002bb4e43403ed21461a88d664da4e90a8ca4c1':
Fix AnimationTest#testSetAnimationListener
diff --git a/tests/res/layout/textview_layout.xml b/tests/res/layout/textview_layout.xml
index 1437be9..512184f 100644
--- a/tests/res/layout/textview_layout.xml
+++ b/tests/res/layout/textview_layout.xml
@@ -33,6 +33,7 @@
android:textColorHint="@drawable/red"
android:textColorLink="@drawable/blue"
android:textScaleX="1.2"
+ android:typeface="normal"
android:textSize="20px"
android:textStyle="normal"
android:layout_width="wrap_content"
diff --git a/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java b/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
index af47299..e5df794 100644
--- a/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
+++ b/tests/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
@@ -65,11 +65,15 @@
}
public void testGetMaximumTimeToLock() {
+ long originalTimeout = mDevicePolicyManager.getMaximumTimeToLock(mComponent);
+
mDevicePolicyManager.setMaximumTimeToLock(mComponent, 3000);
assertEquals(3000, mDevicePolicyManager.getMaximumTimeToLock(mComponent));
mDevicePolicyManager.setMaximumTimeToLock(mComponent, 5000);
assertEquals(5000, mDevicePolicyManager.getMaximumTimeToLock(mComponent));
+
+ mDevicePolicyManager.setMaximumTimeToLock(mComponent, originalTimeout);
}
public void testGetMaximumFailedPasswordsForWipe() {
diff --git a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
index f533239..beebbc4 100644
--- a/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/FileSystemPermissionTest.java
@@ -290,6 +290,7 @@
"/data/local/tmp",
"/data/local/tmp/com.nuance.android.vsuite.vsuiteapp",
"/data/log",
+ "/data/logger",
"/data/lost+found",
"/data/misc",
"/data/misc/bluetooth",
diff --git a/tests/tests/view/src/android/view/cts/KeyEventTest.java b/tests/tests/view/src/android/view/cts/KeyEventTest.java
old mode 100644
new mode 100755
index 7c1f1c7..61d7d92
--- a/tests/tests/view/src/android/view/cts/KeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/KeyEventTest.java
@@ -105,7 +105,6 @@
assertEquals(0, keyData.number);
assertEquals('z', keyData.meta[0]);
assertEquals('Z', keyData.meta[1]);
- assertEquals(0, keyData.meta[2]);
assertEquals(0, keyData.meta[3]);
}
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index a5c27c9..d7ce2b5 100755
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -1797,7 +1797,7 @@
assertEquals(20f, mTextView.getTextSize(), 0.01f);
// getTypeface
- // getTypeface will be null if android:typeface is not set or is set to normal,
+ // getTypeface will be null if android:typeface is set to normal,
// and android:style is not set or is set to normal
assertNull(mTextView.getTypeface());