diff options
| author | Alex Klyubin <klyubin@google.com> | 2013-10-03 15:21:08 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-03 15:21:08 -0700 |
| commit | aa947f15314a4239de91a1cd0bea085e3399d43e (patch) | |
| tree | 543cd13e3fdc13a1b1c1a5e2f70604b080bd6c19 /services/tests | |
| parent | 3e64aa117ad52c71d9676761b8f6a6947cb7ac15 (diff) | |
| parent | a9bce46876d6f1f82727ab6922748fcc6b43c767 (diff) | |
| download | frameworks_base-aa947f15314a4239de91a1cd0bea085e3399d43e.zip frameworks_base-aa947f15314a4239de91a1cd0bea085e3399d43e.tar.gz frameworks_base-aa947f15314a4239de91a1cd0bea085e3399d43e.tar.bz2 | |
am a9bce468: am 84742149: Merge "Make EntropyMixer mix in output of Hardware RNG into Linux RNG."
* commit 'a9bce46876d6f1f82727ab6922748fcc6b43c767':
Make EntropyMixer mix in output of Hardware RNG into Linux RNG.
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/EntropyMixerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java b/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java index 58d6dae..50e7a03 100644 --- a/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java +++ b/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java @@ -34,7 +34,7 @@ public class EntropyMixerTest extends AndroidTestCase { assertEquals(0, FileUtils.readTextFile(file, 0, null).length()); // The constructor has the side effect of writing to file - new EntropyMixer(getContext(), "/dev/null", file.getCanonicalPath()); + new EntropyMixer(getContext(), "/dev/null", file.getCanonicalPath(), "/dev/null"); assertTrue(FileUtils.readTextFile(file, 0, null).length() > 0); } |