Projects >> MobiPerf >>d13a1549f6affe883784f91e74526eff11ac7433

Chunk
Conflicting content
 * @author wenjiezeng@google.com (Steve Zeng)
 */
public class MeasurementScheduler extends Service {
<<<<<<< HEAD
  // The default checkin interval in seconds
  private static final boolean DEFAULT_CHECKIN_ENABLED = false;
  private static final int DEDAULT_CHECKIN_INTERVAL_SEC = 5 * 60;
  private static final long PAUSE_BETWEEN_CHECKIN_CHANGE_SEC = 2L;
  //default minimum battery percentage to run measurements
  private static final int DEFAULT_BATTERY_THRES_PRECENT = 60;
=======
>>>>>>> 59e17041f2f6ae98d5b398f55c4f5122a6cec347
  
  private ScheduledThreadPoolExecutor measurementExecutor;
  private Handler receiver;
Solution content
 * @author wenjiezeng@google.com (Steve Zeng)
 */
public class MeasurementScheduler extends Service {
  
  private ScheduledThreadPoolExecutor measurementExecutor;
  private Handler receiver;
File
MeasurementScheduler.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment