Merge pull request mozilla#154 from pepyakin/master

Fix service preemption by putting it into foreground.
dougt · Oct 31, 2013 · 4a35c68 · 4a35c68
2 parents bb92c16 + 9e3f534
commit 4a35c68
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/org/mozilla/mozstumbler/ScannerService.java b/src/org/mozilla/mozstumbler/ScannerService.java
@@ -25,7 +25,7 @@ public final class ScannerService extends Service {
     public static final String  MESSAGE_TOPIC   = "org.mozilla.mozstumbler.serviceMessage";
 
     private static final String LOGTAG          = ScannerService.class.getName();
-    private static final int    NOTIFICATION_ID = 0;
+    private static final int    NOTIFICATION_ID = 1;
     private static final int    WAKE_TIMEOUT    = 5 * 1000;
 
     private Scanner             mScanner;
@@ -105,6 +105,7 @@ public void run() {
 
                     NotificationManager nm = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
                     nm.cancel(NOTIFICATION_ID);
+                    stopForeground(true);
 
                     mScanner.stopScanning();
 
@@ -216,7 +217,7 @@ public void run() {
 
                 int icon = R.drawable.ic_status_scanning;
                 Notification n = buildNotification(ctx, icon, title, text, contentIntent, flags);
-                nm.notify(NOTIFICATION_ID, n);
+                startForeground(NOTIFICATION_ID, n);
             }
         });
     }