} catch (Throwable e) {
                Slog.e(TAG, "Failure starting DiskStats Service", e);
            }
<<<<<<< HEAD

            try {
                // need to add this service even if SamplingProfilerIntegration.isEnabled()
                // is false, because it is this service that detects system property change and
                // turns on SamplingProfilerIntegration. Plus, when sampling profiler doesn't work,
                // there is little overhead for running this service.
                Slog.i(TAG, "SamplingProfiler Service");
                ServiceManager.addService("samplingprofiler",
                            new SamplingProfilerService(context));
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting SamplingProfiler Service", e);
            }

            try {
                SipService sipService = SipService.create(context);
                if (sipService != null) {
                    Slog.i(TAG, "Sip Service");
                    ServiceManager.addService("sip", sipService);
                }
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting SIP Service", e);
            }

            try {
                Slog.i(TAG, "NetworkTimeUpdateService");
                networkTimeUpdater = new NetworkTimeUpdateService(context);
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting NetworkTimeUpdate service");
            }
=======
>>>>>>> 2a36a778d384403cd92b1016ed5c860d3f2c3521
        }

        // make sure the ADB_ENABLED setting value matches the secure property value

            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting DiskStats Service", e);
            }

            try {
                // need to add this service even if SamplingProfilerIntegration.isEnabled()
                // is false, because it is this service that detects system property change and
                // turns on SamplingProfilerIntegration. Plus, when sampling profiler doesn't work,
                // there is little overhead for running this service.
                Slog.i(TAG, "SamplingProfiler Service");
                ServiceManager.addService("samplingprofiler",
                            new SamplingProfilerService(context));
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting SamplingProfiler Service", e);
            }

            try {
                SipService sipService = SipService.create(context);
                if (sipService != null) {
                    Slog.i(TAG, "Sip Service");
                    ServiceManager.addService("sip", sipService);
                }
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting SIP Service", e);
            }

            try {
                Slog.i(TAG, "NetworkTimeUpdateService");
                networkTimeUpdater = new NetworkTimeUpdateService(context);
            } catch (Throwable e) {
                Slog.e(TAG, "Failure starting NetworkTimeUpdate service");
            }
        }

        // make sure the ADB_ENABLED setting value matches the secure property value