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

am c25cfc57: am 24d02652: Merge "Prevent EntropyMixer from registering with service manager."

Browse Source 
* commit 'c25cfc57e0d863b002620f5e7dd14822418c678f':
  Prevent EntropyMixer from registering with service manager.
This commit is contained in:
dcashman
2014-12-01 23:59:50 +00:00
committed by Android Git Automerger
parent 7dedb12425 c25cfc57e0
commit 6ec2cbd8d2
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -409,6 +409,7 @@ public final class SystemServer {
ConsumerIrService consumerIr = null; ConsumerIrService consumerIr = null;
AudioService audioService = null; AudioService audioService = null;
MmsServiceBroker mmsService = null; MmsServiceBroker mmsService = null;
EntropyMixer entropyMixer = null;
boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false); boolean disableStorage = SystemProperties.getBoolean("config.disable_storage", false);
boolean disableMedia = SystemProperties.getBoolean("config.disable_media", false); boolean disableMedia = SystemProperties.getBoolean("config.disable_media", false);
@@ -433,7 +434,7 @@ public final class SystemServer {
ServiceManager.addService("telephony.registry", telephonyRegistry); ServiceManager.addService("telephony.registry", telephonyRegistry);
Slog.i(TAG, "Entropy Mixer"); Slog.i(TAG, "Entropy Mixer");
ServiceManager.addService("entropy", new EntropyMixer(context)); entropyMixer = new EntropyMixer(context);
mContentResolver = context.getContentResolver(); mContentResolver = context.getContentResolver();