commit 630d8cf21b39104557763a5518cfb1e80ab8fb76
author Brian Muramatsu <btmura@google.com> Wed Jul 06 16:15:08 2011 -0700
committer Brian Muramatsu <btmura@google.com> Wed Jul 06 16:15:08 2011 -0700
tree 666581eb81ad06b60c2d6999c63c387cf948790b
parent 5b457c12938ce7e6d077f2897d9cb3c74cb2ebbb
parent 6712ccc9235ff5082cf229e607bfbf46618b62c9

Merge remote branch 'goog/honeycomb' into manualmerge

Conflicts:
	tests/expectations/knownfailures-3.0_r1.txt

Change-Id: I9f7a4cc4b089dfdad914d97b2f6b02b9396b7539

tests/expectations/knownfailures-3.0_r1.txt

diff --git a/tests/expectations/knownfailures-3.0_r1.txt b/tests/expectations/knownfailures-3.0_r1.txt
index d653c14..91e8be6 100644
--- a/tests/expectations/knownfailures-3.0_r1.txt
+++ b/tests/expectations/knownfailures-3.0_r1.txt
@@ -1,5 +1,9 @@
 [
 {
+  name: "android.admin.cts.DevicePolicyManagerTest",
+  bug: 4993068
+},
+{
   name: "android.media.cts.MediaRecorderTest#testSetCamera",
   bug: 4464677
 },

tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java

diff --git a/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java b/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
index 64ca4c3..b9f842d 100644
--- a/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
+++ b/tests/tests/admin/src/android/admin/cts/DeviceAdminReceiverTest.java
@@ -60,14 +60,6 @@
         mReceiver.reset();
         mReceiver.onReceive(mContext, new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLED));
         assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_DISABLED));
-
-        mReceiver.reset();
-        mReceiver.onReceive(mContext,
-                new Intent(DeviceAdminReceiver.ACTION_DEVICE_ADMIN_DISABLE_REQUESTED));
-        assertTrue(mReceiver.hasFlags(DEVICE_ADMIN_DISABLE_REQUESTED));
-        assertNotNull(mReceiver.getResultExtras(false));
-        assertEquals(DISABLE_WARNING, mReceiver.getResultExtras(false)
-                .getString(DeviceAdminReceiver.EXTRA_DISABLE_WARNING));
     }
 
     private class TestReceiver extends DeviceAdminReceiver {