author | Joel Maher <jmaher@mozilla.com> |
Thu, 08 Nov 2012 07:33:00 -0500 | |
changeset 112674 | e97f0b690380b0703715a6ac0b687e1618bdc838 |
parent 112673 | 84b0991ccd9781f8231179dbc623e9a1bffe48e0 |
child 112675 | 2556aa291476ceaf5245af11bfaee7596d195b49 |
push id | 23835 |
push user | ryanvm@gmail.com |
push date | Fri, 09 Nov 2012 00:52:02 +0000 |
treeherder | mozilla-central@27ae6c86237f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | wlach |
bugs | 809366 |
milestone | 19.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
build/mobile/sutagent/android/watcher/WatcherService.java | file | annotate | diff | comparison | revisions |
--- a/build/mobile/sutagent/android/watcher/WatcherService.java +++ b/build/mobile/sutagent/android/watcher/WatcherService.java @@ -8,16 +8,17 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.util.Date; import java.util.List; import java.util.Timer; import java.util.TimerTask; import android.app.Activity; import android.app.ActivityManager; import android.app.KeyguardManager; import android.app.Notification; @@ -48,16 +49,17 @@ public class WatcherService extends Serv { String sErrorPrefix = "##Installer Error## "; String currentDir = "/"; String sPingTarget = ""; long lDelay = 60000; long lPeriod = 300000; int nMaxStrikes = 0; // maximum number of tries before we consider network unreachable (0 means don't check) boolean bStartSUTAgent = true; + boolean bStartedTimer = false; Process pProc; Context myContext = null; Timer myTimer = null; private PowerManager.WakeLock pwl = null; public static final int NOTIFICATION_ID = 1964; boolean bInstalling = false; @@ -212,19 +214,23 @@ public class WatcherService extends Serv boolean bReboot = intent.getBooleanExtra("reboot", true); int nReboot = bReboot ? 1 : 0; SendNotification("WatcherService updating " + sPkgName + " using file " + sPkgFile, "WatcherService updating " + sPkgName + " using file " + sPkgFile); UpdateApplication worker = new UpdateApplication(sPkgName, sPkgFile, sOutFile, nReboot); } else if (sCmd.equalsIgnoreCase("start")) { - doToast("WatcherService started"); - myTimer = new Timer(); - myTimer.scheduleAtFixedRate(new MyTime(), lDelay, lPeriod); + if (!this.bStartedTimer) { + doToast("WatcherService started"); + myTimer = new Timer(); + Date startSchedule = new Date(System.currentTimeMillis() + lDelay); + myTimer.schedule(new MyTime(), startSchedule, lPeriod); + this.bStartedTimer = true; + } } else { doToast("WatcherService unknown command"); } } else doToast("WatcherService created");