diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2012-09-27 19:34:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-27 19:34:28 -0700 |
| commit | ae1af49a914cdbbd64ee069ad3f9913c7c6632f0 (patch) | |
| tree | 2e7d9aa5d4f3191480f2c142ea1d6061f9aac4a9 /services/tests | |
| parent | a7346d208635c29c8b69403f948cc2145fb6def7 (diff) | |
| parent | 3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786 (diff) | |
| download | frameworks_base-ae1af49a914cdbbd64ee069ad3f9913c7c6632f0.zip frameworks_base-ae1af49a914cdbbd64ee069ad3f9913c7c6632f0.tar.gz frameworks_base-ae1af49a914cdbbd64ee069ad3f9913c7c6632f0.tar.bz2 | |
am 3a8af8ef: Merge "Migrate more Secure settings to Global." into jb-mr1-dev
* commit '3a8af8efff93ca8ee80fc8c7841e7bee9a8b7786':
Migrate more Secure settings to Global.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/DropBoxTest.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/services/tests/servicestests/src/com/android/server/DropBoxTest.java b/services/tests/servicestests/src/com/android/server/DropBoxTest.java index f3baff4..6ce0a48 100644 --- a/services/tests/servicestests/src/com/android/server/DropBoxTest.java +++ b/services/tests/servicestests/src/com/android/server/DropBoxTest.java @@ -45,10 +45,10 @@ import java.util.zip.GZIPOutputStream; public class DropBoxTest extends AndroidTestCase { public void tearDown() throws Exception { ContentResolver cr = getContext().getContentResolver(); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_AGE_SECONDS, ""); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_MAX_FILES, ""); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_QUOTA_KB, ""); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_TAG_PREFIX + "DropBoxTest", ""); + Settings.Global.putString(cr, Settings.Global.DROPBOX_AGE_SECONDS, ""); + Settings.Global.putString(cr, Settings.Global.DROPBOX_MAX_FILES, ""); + Settings.Global.putString(cr, Settings.Global.DROPBOX_QUOTA_KB, ""); + Settings.Global.putString(cr, Settings.Global.DROPBOX_TAG_PREFIX + "DropBoxTest", ""); } public void testAddText() throws Exception { @@ -254,13 +254,13 @@ public class DropBoxTest extends AndroidTestCase { assertTrue(dropbox.isTagEnabled("DropBoxTest")); ContentResolver cr = getContext().getContentResolver(); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_TAG_PREFIX + "DropBoxTest", + Settings.Global.putString(cr, Settings.Global.DROPBOX_TAG_PREFIX + "DropBoxTest", "disabled"); dropbox.addText("DropBoxTest", "TEST-DISABLED"); assertFalse(dropbox.isTagEnabled("DropBoxTest")); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_TAG_PREFIX + "DropBoxTest", + Settings.Global.putString(cr, Settings.Global.DROPBOX_TAG_PREFIX + "DropBoxTest", ""); dropbox.addText("DropBoxTest", "TEST-ENABLED-AGAIN"); @@ -330,7 +330,7 @@ public class DropBoxTest extends AndroidTestCase { // Limit storage to 10 blocks int kb = blockSize * 10 / 1024; ContentResolver cr = getContext().getContentResolver(); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_QUOTA_KB, Integer.toString(kb)); + Settings.Global.putString(cr, Settings.Global.DROPBOX_QUOTA_KB, Integer.toString(kb)); // Three tags using a total of 12 blocks: // DropBoxTest0 [ ][ ] @@ -432,8 +432,8 @@ public class DropBoxTest extends AndroidTestCase { // Limit storage to 10 blocks with an expiration of 1 second int kb = blockSize * 10 / 1024; ContentResolver cr = getContext().getContentResolver(); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_AGE_SECONDS, "1"); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_QUOTA_KB, Integer.toString(kb)); + Settings.Global.putString(cr, Settings.Global.DROPBOX_AGE_SECONDS, "1"); + Settings.Global.putString(cr, Settings.Global.DROPBOX_QUOTA_KB, Integer.toString(kb)); // Write one normal entry and another so big that it is instantly tombstoned long before = System.currentTimeMillis(); @@ -497,7 +497,7 @@ public class DropBoxTest extends AndroidTestCase { // Limit to 3 files and add one more entry ContentResolver cr = getContext().getContentResolver(); - Settings.Secure.putString(cr, Settings.Secure.DROPBOX_MAX_FILES, "3"); + Settings.Global.putString(cr, Settings.Global.DROPBOX_MAX_FILES, "3"); dropbox.addText("DropBoxTest", "TEST6"); // Verify only 3 files left |