Projects >> Speedometer >>fa919b404de090af18dfa30f596343ad6a276bec

Chunk
Conflicting content 
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
<<<<<<< HEAD
import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
=======
import java.security.InvalidParameterException;
>>>>>>> 2ad4428ece1ab234630dfbaac792956974c9e2db
import java.util.Calendar;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
Solution content 
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Comparator;
import java.util.ConcurrentModificationException;
File
MeasurementScheduler.java
Developer's decision
Version 1
Kind of conflict
Import
Chunk
Conflicting content 
            measurementIntentSender);
      }
      holdPowerLockForAWhile();
<<<<<<< HEAD
    } catch (NullPointerException e) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", e);
    } catch (IllegalArgumentException e) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", e);
    } catch (Throwable t) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", t);
=======
    } catch (IllegalArgumentException e) {
      // Task creation in clone can create this exception
      Log.e(SpeedometerApp.TAG, "Exception when clonig objects");
>>>>>>> 2ad4428ece1ab234630dfbaac792956974c9e2db
    }
  }
Solution content 
            measurementIntentSender);
      }
      holdPowerLockForAWhile();
    } catch (NullPointerException e) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", e);
    } catch (IllegalArgumentException e) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", e);
    } catch (Throwable t) {
      Log.e(SpeedometerApp.TAG, "An error has occured while handling measurements", t);
    }
  }
File
MeasurementScheduler.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Comment
Method invocation