diff options
| author | dcashman <dcashman@google.com> | 2014-11-26 17:16:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-26 17:17:00 +0000 |
| commit | 0e0dbf9367371a0315461f9afd5167d56fc9428c (patch) | |
| tree | 6bff63fb974587bb248e5da45f95b0a12907b3ef /services/java/com/android/server/SystemServer.java | |
| parent | e2d619b6633616f8a993ff7a9ea889c258b40153 (diff) | |
| parent | 9287e0dd272b85b475e33bcbd7d868517a0f98f9 (diff) | |
| download | frameworks_base-0e0dbf9367371a0315461f9afd5167d56fc9428c.zip frameworks_base-0e0dbf9367371a0315461f9afd5167d56fc9428c.tar.gz frameworks_base-0e0dbf9367371a0315461f9afd5167d56fc9428c.tar.bz2 | |
Merge "Prevent EntropyMixer from registering with service manager."
Diffstat (limited to 'services/java/com/android/server/SystemServer.java')
| -rw-r--r-- | services/java/com/android/server/SystemServer.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index b3a696e..266c69c 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -409,6 +409,7 @@ public final class SystemServer { ConsumerIrService consumerIr = null; AudioService audioService = null; MmsServiceBroker mmsService = null; + EntropyMixer entropyMixer = null; boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false); boolean disableMedia = SystemProperties.getBoolean("config.disable_media", false); @@ -433,7 +434,7 @@ public final class SystemServer { ServiceManager.addService("telephony.registry", telephonyRegistry); Slog.i(TAG, "Entropy Mixer"); - ServiceManager.addService("entropy", new EntropyMixer(context)); + entropyMixer = new EntropyMixer(context); mContentResolver = context.getContentResolver(); |