Projects >> frameworks_base_disabled >>8e64fca6f1f46095b7d4272de176d3b6fa7bcb24

Chunk
Conflicting content 
    /** {@inheritDoc} */
    public void screenTurningOn(final ScreenOnListener screenOnListener) {
        EventLog.writeEvent(70000, 1);
<<<<<<< HEAD
        if (mKeyguardMediator != null) {
            //Slog.i(TAG, "Screen turning on...");
=======
        if (false) {
            RuntimeException here = new RuntimeException("here");
            here.fillInStackTrace();
            Slog.i(TAG, "Screen turning on...", here);
        }
        if (screenOnListener != null) {
>>>>>>> fb49cd9539908c1d00fefbcaaac05b05f4f38726
            mKeyguardMediator.onScreenTurnedOn(new KeyguardViewManager.ShowListener() {
                @Override public void onShown(IBinder windowToken) {
                    if (windowToken != null) {
Solution content 
    /** {@inheritDoc} */
    public void screenTurningOn(final ScreenOnListener screenOnListener) {
        EventLog.writeEvent(70000, 1);
        if (false) {
            RuntimeException here = new RuntimeException("here");
            here.fillInStackTrace();
            Slog.i(TAG, "Screen turning on...", here);
        }
        if (screenOnListener != null && mKeyguardMediator != null) {
            mKeyguardMediator.onScreenTurnedOn(new KeyguardViewManager.ShowListener() {
                @Override public void onShown(IBinder windowToken) {
                    if (windowToken != null) {
File
PhoneWindowManager.java
Developer's decision
Manual
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
                @Override public void onShown(IBinder windowToken) {
                    if (windowToken != null) {
                        try {
<<<<<<< HEAD
                            mWindowManager.waitForWindowDrawn(windowToken, new IRemoteCallback.Stub() {
                                @Override public void sendResult(Bundle data) {
                                    Slog.i(TAG, "Lock screen displayed!");
                                    screenOnListener.onScreenOn();
                                synchronized (mLock) {
                                    mScreenOnFully = true;
                                }
                                }
=======
                            mWindowManager.waitForWindowDrawn(windowToken,
                                    new IRemoteCallback.Stub() {
                                @Override public void sendResult(Bundle data) {
                                    Slog.i(TAG, "Lock screen displayed!");
                                    screenOnListener.onScreenOn();
                                    synchronized (mLock) {
                                        mScreenOnFully = true;
                                    }
                                }
>>>>>>> fb49cd9539908c1d00fefbcaaac05b05f4f38726
                            });
                        } catch (RemoteException e) {
                        }
Solution content 
                @Override public void onShown(IBinder windowToken) {
                    if (windowToken != null) {
                        try {
                            mWindowManager.waitForWindowDrawn(windowToken,
                                    new IRemoteCallback.Stub() {
                                @Override public void sendResult(Bundle data) {
                                    Slog.i(TAG, "Lock screen displayed!");
                                    screenOnListener.onScreenOn();
                                    synchronized (mLock) {
                                        mScreenOnFully = true;
                                    }
                                }
                            });
                        } catch (RemoteException e) {
                        }
File
PhoneWindowManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
                    } else {
                        Slog.i(TAG, "No lock screen!");
                        screenOnListener.onScreenOn();
<<<<<<< HEAD
                    synchronized (mLock) {
                        mScreenOnFully = true;
=======
                        synchronized (mLock) {
                            mScreenOnFully = true;
                        }
>>>>>>> fb49cd9539908c1d00fefbcaaac05b05f4f38726
                    }
                    }
                }
Solution content 
                    } else {
                        Slog.i(TAG, "No lock screen!");
                        screenOnListener.onScreenOn();
                        synchronized (mLock) {
                            mScreenOnFully = true;
                        }
                    }
                }
File
PhoneWindowManager.java
Developer's decision
Version 1
Kind of conflict
Synchronized statement
Chunk
Conflicting content 
                    }
                }
            });
<<<<<<< HEAD
=======
        } else {
            synchronized (mLock) {
                mScreenOnFully = true;
            }
>>>>>>> fb49cd9539908c1d00fefbcaaac05b05f4f38726
        }
        synchronized (mLock) {
            mScreenOnEarly = true;
Solution content 
                    }
                }
            });
        } else {
            synchronized (mLock) {
                mScreenOnFully = true;
            }
        }
        synchronized (mLock) {
            mScreenOnEarly = true;
File
PhoneWindowManager.java
Developer's decision
Version 2
Kind of conflict
Synchronized statement