Projects >> android_frameworks_base >>e3206c1603275c3de50e96156aacd8e23ac9ff7c

Chunk
Conflicting content
    /** {@inheritDoc} */
    public void screenTurningOn(final ScreenOnListener screenOnListener) {
        EventLog.writeEvent(70000, 1);
<<<<<<< HEAD
        if (false) {
            RuntimeException here = new RuntimeException("here");
            here.fillInStackTrace();
            Slog.i(TAG, "Screen turning on...", here);
        }
        if (screenOnListener != null) {
            mKeyguardMediator.onScreenTurnedOn(new KeyguardViewManager.ShowListener() {
                @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) {
                        }
                    } else {
                        Slog.i(TAG, "No lock screen!");
                        screenOnListener.onScreenOn();
                        synchronized (mLock) {
                            mScreenOnFully = true;
                        }
                    }
=======
        //Slog.i(TAG, "Screen turning on...");
        mKeyguardMediator.onScreenTurnedOn(new KeyguardViewManager.ShowListener() {
            @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) {
                    }
                } else {
                    Slog.i(TAG, "No lock screen!");
                    screenOnListener.onScreenOn();
                    synchronized (mLock) {
                        mScreenOnFully = true;
                    }
>>>>>>> 1fd6c33620171893b2e92c38b731fd89e5a8dd66
                }
            });
        } else {
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.onScreenTurnedOn(new KeyguardViewManager.ShowListener() {
                @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) {
                        }
                    } else {
                        Slog.i(TAG, "No lock screen!");
                        screenOnListener.onScreenOn();
                        synchronized (mLock) {
                            mScreenOnFully = true;
                        }
                    }
                }
            });
        } else {
File
PhoneWindowManager.java
Developer's decision
Version 1
Kind of conflict
Comment
If statement
Method invocation