Merge branch 'master' into honeycomb-release

This commit is contained in:
The Android Automerger
2010-12-15 07:31:23 -08:00

View File

@@ -82,7 +82,7 @@ public class ForegroundService extends Service {
} }
// Fall back on the old API. // Fall back on the old API.
setForeground(true); //setForeground(true);
mNM.notify(id, notification); mNM.notify(id, notification);
} }
@@ -109,7 +109,7 @@ public class ForegroundService extends Service {
// Fall back on the old API. Note to cancel BEFORE changing the // Fall back on the old API. Note to cancel BEFORE changing the
// foreground state, since we could be killed at that point. // foreground state, since we could be killed at that point.
mNM.cancel(id); mNM.cancel(id);
setForeground(false); //setForeground(false);
} }
@Override @Override