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

Commit 17a90028 authored by Tim Murray's avatar Tim Murray Committed by android-build-merger
Browse files

Merge "DO NOT MERGE: disable iorap in q" into qt-dev 

am: 263e6392

Change-Id: I068f564cbfb2cb9b8b635962a0025d2cd178adca
parents a45380c6 263e6392

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

+0 −6
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ import com.android.server.wm.WindowManagerService; 


import dalvik.system.VMRuntime;



import com.google.android.startop.iorap.IorapForwardingService;



import java.io.File;

import java.io.IOException;

import java.util.Locale;
@@ -1072,10 +1070,6 @@ public final class SystemServer { 
            mSystemServiceManager.startService(PinnerService.class);

            traceEnd();



            traceBeginAndSlog("IorapForwardingService");

            mSystemServiceManager.startService(IorapForwardingService.class);

            traceEnd();



            traceBeginAndSlog("SignedConfigService");

            SignedConfigService.registerUpdateReceiver(mSystemContext);

            traceEnd();