Projects >> platform_frameworks_base >>232b4d60a6653736b52922c3d3ec167ce8a54962

Chunk
Conflicting content 
            public void run() {
                Slog.i(TAG, "Making services ready");

<<<<<<< HEAD
                if (!headless) {
                    startSystemUi(contextF);
                }
=======
                try {
                    ActivityManagerService.self().startObservingNativeCrashes();
                } catch (Throwable e) {
                    reportWtf("observing native crashes", e);
                }
                if (!headless) startSystemUi(contextF);
>>>>>>> c16da6aa156128d6d47dbbb86db4685c3c44b52e
                try {
                    if (mountServiceF != null) mountServiceF.systemReady();
                } catch (Throwable e) {
Solution content 
            public void run() {
                Slog.i(TAG, "Making services ready");

                try {
                    ActivityManagerService.self().startObservingNativeCrashes();
                } catch (Throwable e) {
                    reportWtf("observing native crashes", e);
                }
                if (!headless) {
                    startSystemUi(contextF);
                }
                try {
                    if (mountServiceF != null) mountServiceF.systemReady();
                } catch (Throwable e) {
File
SystemServer.java
Developer's decision
Combination
Kind of conflict
If statement
Try statement