Projects >> platform_packages_apps_calendar >>bae65e9ce228a0243a80b55b9b4f10a8d810e24e

Chunk
Conflicting content
        return new AlarmManagerInterface() {
            @Override
            public void set(int type, long triggerAtMillis, PendingIntent operation) {
<<<<<<< HEAD
                mgr.setExact(type, triggerAtMillis, operation);
=======
                if (Utils.isKeyLimePieOrLater()) {
                    mgr.setExact(type, triggerAtMillis, operation);
                } else {
                    mgr.set(type, triggerAtMillis, operation);
                }
>>>>>>> e8305d6e1674bcc7cdb4e99e50f48fbcfd23d4db
            }
        };
    }
Solution content
        return new AlarmManagerInterface() {
            @Override
            public void set(int type, long triggerAtMillis, PendingIntent operation) {
                mgr.setExact(type, triggerAtMillis, operation);
            }
        };
    }
File
AlertUtils.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation