Projects >> packages_apps_DeskClock >>4b7cc175917adc2ac20ecf5a63efad3273bc2059

Chunk
Conflicting content
            return;
        }

<<<<<<< HEAD
=======
        // Wake the device and stay awake until the AlarmAlert intent is
        // handled. Also acquire the screen lock so that if the AlarmAlert
        // activity is paused, it will be resumed.
        AlarmAlertWakeLock.acquireCpuWakeLock(context);
        AlarmAlertWakeLock.acquireScreenWakeLock(context);

>>>>>>> 372cbb5437b209f6d909ea247080da6a48c3a590
        /* Close dialogs and window shade */
        Intent closeDialogs = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
        context.sendBroadcast(closeDialogs);
Solution content
            return;
        }

        /* Close dialogs and window shade */
        Intent closeDialogs = new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS);
        context.sendBroadcast(closeDialogs);
File
AlarmReceiver.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation