Projects >> android_packages_providers_CalendarProvider >>bb0fc0b885ca39a89397024b368890f096f12a49

Chunk
Conflicting content
        @Override
        public void run() {
            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
<<<<<<< HEAD
            doUpdateTimezoneDependentFields();
=======
            try {
                doUpdateTimezoneDependentFields();
                triggerAppWidgetUpdate(-1 /*changedEventId*/ );
            } catch (SQLException e) {
                if (Log.isLoggable(TAG, Log.ERROR)) {
                    Log.e(TAG, "doUpdateTimezoneDependentFields() failed", e);
                }
                try {
                    // Clear at least the in-memory data (and if possible the
                    // database fields) to force a re-computation of Instances.
                    mMetaData.clearInstanceRange();
                } catch (SQLException e2) {
                    if (Log.isLoggable(TAG, Log.ERROR)) {
                        Log.e(TAG, "clearInstanceRange() also failed: " + e2);
                    }
                }
            }
>>>>>>> e43e3300d9332b21153f6d16280f80bea8b7e097
        }
    }
Solution content
        @Override
        public void run() {
            Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
            doUpdateTimezoneDependentFields();
        }
    }
File
CalendarProvider2.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Try statement