diff options
| -rw-r--r-- | services/java/com/android/server/EntropyMixer.java (renamed from services/java/com/android/server/EntropyService.java) | 8 | ||||
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/EntropyMixerTest.java (renamed from services/tests/servicestests/src/com/android/server/EntropyServiceTest.java) | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/services/java/com/android/server/EntropyService.java b/services/java/com/android/server/EntropyMixer.java index 788a2f5..b63a70e 100644 --- a/services/java/com/android/server/EntropyService.java +++ b/services/java/com/android/server/EntropyMixer.java @@ -47,8 +47,8 @@ import android.util.Slog; * <p>TODO: Investigate attempting to write entropy data at shutdown time * instead of periodically. */ -public class EntropyService extends Binder { - private static final String TAG = "EntropyService"; +public class EntropyMixer extends Binder { + private static final String TAG = "EntropyMixer"; private static final int ENTROPY_WHAT = 1; private static final int ENTROPY_WRITE_PERIOD = 3 * 60 * 60 * 1000; // 3 hrs private static final long START_TIME = System.currentTimeMillis(); @@ -72,12 +72,12 @@ public class EntropyService extends Binder { } }; - public EntropyService() { + public EntropyMixer() { this(getSystemDir() + "/entropy.dat", "/dev/urandom"); } /** Test only interface, not for public use */ - public EntropyService(String entropyFile, String randomDevice) { + public EntropyMixer(String entropyFile, String randomDevice) { if (randomDevice == null) { throw new NullPointerException("randomDevice"); } if (entropyFile == null) { throw new NullPointerException("entropyFile"); } diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 3ae62ad..762acbb 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -133,8 +133,8 @@ class ServerThread extends Thread { // Critical services... try { - Slog.i(TAG, "Entropy Service"); - ServiceManager.addService("entropy", new EntropyService()); + Slog.i(TAG, "Entropy Mixer"); + ServiceManager.addService("entropy", new EntropyMixer()); Slog.i(TAG, "Power Manager"); power = new PowerManagerService(); diff --git a/services/tests/servicestests/src/com/android/server/EntropyServiceTest.java b/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java index 636ba21..21a8ec2 100644 --- a/services/tests/servicestests/src/com/android/server/EntropyServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/EntropyMixerTest.java @@ -23,9 +23,9 @@ import android.test.AndroidTestCase; import java.io.File; /** - * Tests for {@link com.android.server.EntropyService} + * Tests for {@link com.android.server.EntropyMixer} */ -public class EntropyServiceTest extends AndroidTestCase { +public class EntropyMixerTest extends AndroidTestCase { public void testInitialWrite() throws Exception { File dir = getContext().getDir("testInitialWrite", Context.MODE_PRIVATE); @@ -34,7 +34,7 @@ public class EntropyServiceTest extends AndroidTestCase { assertEquals(0, FileUtils.readTextFile(file, 0, null).length()); // The constructor has the side effect of writing to file - new EntropyService("/dev/null", file.getCanonicalPath()); + new EntropyMixer("/dev/null", file.getCanonicalPath()); assertTrue(FileUtils.readTextFile(file, 0, null).length() > 0); } |