Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename EntropyService to EntropyMixer

Browse Source 
EntropyService implies that this program provides entropy to other
programs, and is misleading. The EntropyMixer class is designed purely
to stir the existing entropy pool with some possibily random-ish data,
and carryover entropy across device reboots.

Change-Id: I086cd339a3b652d32371521e61e1b1f555ce2280
This commit is contained in:
Nick Kralevich
2011-11-17 13:24:32 -08:00
parent 131ed03f30
commit 6967cbc959
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/EntropyService.java → services/java/com/android/server/EntropyMixer.java
View File

@@ -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"); }

4
services/java/com/android/server/SystemServer.java
View File

@@ -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();

6
services/tests/servicestests/src/com/android/server/EntropyServiceTest.java → services/tests/servicestests/src/com/android/server/EntropyMixerTest.java
View File

@@ -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);
}