diff options
author | dcashman <dcashman@google.com> | 2014-12-01 23:49:25 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-01 23:49:26 +0000 |
commit | 24d02652bf8df12a41acf500d958109ef3d99b9a (patch) | |
tree | 8c62e9d909acb3816ca572c75ec110333a0fc9b8 /services/java/com/android/server/SystemServer.java | |
parent | c859b85cb530e608da775bb18744a996483a0311 (diff) | |
parent | fe8afa99a7109e7237b5e51271f6a94101dc7e68 (diff) | |
download | frameworks_base-24d02652bf8df12a41acf500d958109ef3d99b9a.zip frameworks_base-24d02652bf8df12a41acf500d958109ef3d99b9a.tar.gz frameworks_base-24d02652bf8df12a41acf500d958109ef3d99b9a.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 af256f0..5573017 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -407,6 +407,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); @@ -430,7 +431,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(); |