commit 88148d24d66b6992245a130aa7810032ba5daba6
author Brian Muramatsu <btmura@google.com> Wed Jun 29 17:47:14 2011 -0700
committer Brian Muramatsu <btmura@google.com> Wed Jun 29 17:47:14 2011 -0700
tree e2de11a20476bcdff2a5c8f0a8a61c93bcd8a0d9
parent 76c5025ef36ca15e14c2dd4ffd13165dcd656110
parent 99ca2c610588d9f690d8738d965837607641153f

Merge remote branch 'goog/gingerbread' into manualmerge

apps/CtsVerifier/src/com/android/cts/verifier/admin/PolicySerializationTestActivity.java

diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/admin/PolicySerializationTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/admin/PolicySerializationTestActivity.java
index 1d8056f..49cc7fe 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/admin/PolicySerializationTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/admin/PolicySerializationTestActivity.java
@@ -106,7 +106,7 @@
     private void loadPolicy() {
         mAdapter.clear();
         SharedPreferences prefs = getPreferences(MODE_PRIVATE);
-        if (prefs.getBoolean(LOAD_EXPECTED_POLICY_PREFERENCE, true)) {
+        if (prefs.getBoolean(LOAD_EXPECTED_POLICY_PREFERENCE, false)) {
             for (PolicyItem<?> item : mPolicyItems) {
                 item.loadExpectedValue(prefs);
                 item.loadActualValue(mDevicePolicyManager, mAdmin);