Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Mobilyzer/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-18
target=android-21
android.library=true
android.library.reference.1=../../../android-sdk-macosx/extras/google/google_play_services/libproject/google-play-services_lib
android.library.reference.2=../../ModifiedExoPlayerLibrary/library/src/main
android.library.reference.1=../../ExoPlayerLib
android.library.reference.2=../../google-play-services_lib
16 changes: 12 additions & 4 deletions Mobilyzer/src/com/mobilyzer/api/API.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
import com.mobilyzer.exceptions.MeasurementError;
import com.mobilyzer.measurements.DnsLookupTask;
import com.mobilyzer.measurements.HttpTask;
import com.mobilyzer.measurements.PageLoadTimeTask;
import com.mobilyzer.measurements.PageLoadTimeTask.PageLoadTimeDesc;
import com.mobilyzer.measurements.ParallelTask;
import com.mobilyzer.measurements.PingTask;
import com.mobilyzer.measurements.SequentialTask;
Expand All @@ -54,6 +56,8 @@
import com.mobilyzer.measurements.TCPThroughputTask.TCPThroughputDesc;
import com.mobilyzer.measurements.TracerouteTask.TracerouteDesc;
import com.mobilyzer.measurements.UDPBurstTask.UDPBurstDesc;
import com.mobilyzer.measurements.VideoQoETask;
import com.mobilyzer.measurements.VideoQoETask.VideoQoEDesc;
import com.mobilyzer.util.Logger;

/**
Expand Down Expand Up @@ -294,10 +298,14 @@ public MeasurementTask createTask( TaskType taskType, Date startTime
task = new UDPBurstTask(new UDPBurstDesc(clientKey, startTime, endTime
, intervalSec, count, priority, contextIntervalSec, params));
break;
// case PLT:
// task = new PageLoadTimeTask(new PageLoadTimeDesc(clientKey, startTime, endTime
// , intervalSec, count, priority, contextIntervalSec, params));
// break;
case PLT:
task = new PageLoadTimeTask(new PageLoadTimeDesc(clientKey, startTime, endTime
, intervalSec, count, priority, contextIntervalSec, params));
break;
case VIDEOQOE:
task = new VideoQoETask(new VideoQoEDesc(clientKey, startTime, endTime
, intervalSec, count, priority, contextIntervalSec, params));
break;
default:
throw new MeasurementError("Undefined measurement type. Candidate: " +
"DNSLOOKUP, HTTP, PING, TRACEROUTE, TCPTHROUGHPUT, UDPBURST");
Expand Down
Loading