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

resolve merge conflicts of 9355bce0c3 to master

Browse Source 
Test: none
Change-Id: Iac65e01d07edf79ec97e7d996f8cfee6f811606b
This commit is contained in:
Hugo Benichi
2017-02-17 10:14:15 +09:00
parent 75ad8a5b21 9355bce0c3
commit 01432b306d
5 changed files with 3 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,6 @@ import com.android.server.audio.AudioService;
import com.android.server.camera.CameraService;
import com.android.server.clipboard.ClipboardService;
import com.android.server.connectivity.IpConnectivityMetrics;
import com.android.server.connectivity.MetricsLoggerService;
import com.android.server.coverage.CoverageService;
import com.android.server.devicepolicy.DevicePolicyManagerService;
import com.android.server.display.DisplayManagerService;
@@ -829,10 +828,6 @@ public final class SystemServer {
traceEnd();
}
traceBeginAndSlog("ConnectivityMetricsLoggerService");
mSystemServiceManager.startService(MetricsLoggerService.class);
traceEnd();
traceBeginAndSlog("IpConnectivityMetrics");
mSystemServiceManager.startService(IpConnectivityMetrics.class);
traceEnd();