Projects >> platform_frameworks_base >>82752ef4f857c1911028d075b4313ecd3bebaf27

Chunk
Conflicting content 
     */
    public boolean isKeyguardLocked() {
        try {
<<<<<<< HEAD
            return mWM.isKeyguardLocked();
=======
            return mWM.isKeyguardSecure();
>>>>>>> bbd460d76dc69eca9a14ab1127b95a55429f460a
        } catch (RemoteException ex) {
            return false;
        }
Solution content 
     */
    public boolean isKeyguardLocked() {
        try {
            return mWM.isKeyguardLocked();
        } catch (RemoteException ex) {
            return false;
        }
File
KeyguardManager.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Return statement