Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ec2cbd8 authored by dcashman's avatar dcashman Committed by Android Git Automerger
Browse files

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

* commit 'c25cfc57':
  Prevent EntropyMixer from registering with service manager.
parents 7dedb124 c25cfc57

services/java/com/android/server/SystemServer.java

+2 −1
Original line number Diff line number Diff line
@@ -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();