diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-09-11 16:48:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-11 16:48:32 -0700 |
| commit | 6c048260f30d9bba1a83c4f79388cd6b3109be7d (patch) | |
| tree | f33b3872e68745cfb7e8bfbcd43a3d35ad1e1fb9 /core/tests | |
| parent | 48b391480519c5d6cb4428af6b29b1e3405e4601 (diff) | |
| parent | 13c7197da8a16f77f6398708a6314c80cb01e0d1 (diff) | |
| download | frameworks_base-6c048260f30d9bba1a83c4f79388cd6b3109be7d.zip frameworks_base-6c048260f30d9bba1a83c4f79388cd6b3109be7d.tar.gz frameworks_base-6c048260f30d9bba1a83c4f79388cd6b3109be7d.tar.bz2 | |
Merge "Revert encryption mapping for device wipes."
Diffstat (limited to 'core/tests')
| -rwxr-xr-x | core/tests/coretests/src/android/content/pm/PackageManagerTests.java | 2 | ||||
| -rwxr-xr-x | core/tests/coretests/src/android/os/storage/AsecTests.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java index 6c87c3b..68ddcc4 100755 --- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java +++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java @@ -1057,7 +1057,7 @@ public class PackageManagerTests extends AndroidTestCase { try { // Wait on observer synchronized(observer) { - getMs().unmountVolume(path, true); + getMs().unmountVolume(path, true, false); long waitTime = 0; while((!observer.isDone()) && (waitTime < MAX_WAIT_TIME) ) { observer.wait(WAIT_TIME_INCR); diff --git a/core/tests/coretests/src/android/os/storage/AsecTests.java b/core/tests/coretests/src/android/os/storage/AsecTests.java index dda3010..5efbd88 100755 --- a/core/tests/coretests/src/android/os/storage/AsecTests.java +++ b/core/tests/coretests/src/android/os/storage/AsecTests.java @@ -421,7 +421,7 @@ public class AsecTests extends AndroidTestCase { try { // Wait on observer synchronized(observer) { - getMs().unmountVolume(path, false); + getMs().unmountVolume(path, false, false); long waitTime = 0; while((!observer.isDone()) && (waitTime < MAX_WAIT_TIME) ) { observer.wait(WAIT_TIME_INCR); @@ -486,7 +486,7 @@ public class AsecTests extends AndroidTestCase { // Wait on observer synchronized(observer) { for (int i = 0; i < 5; i++) { - getMs().unmountVolume(path, false); + getMs().unmountVolume(path, false, false); } long waitTime = 0; while((!observer.isDone()) && (waitTime < MAX_WAIT_TIME) ) { |