am 670889f7: Merge change 27326 into eclair

Merge commit '670889f7e328330909c99f36b35e7a84e2927511' into eclair-plus-aosp

* commit '670889f7e328330909c99f36b35e7a84e2927511':
  Use onStartCommand() in AlertService.

diff --git a/src/com/android/calendar/AlertService.java b/src/com/android/calendar/AlertService.java
index 558a8f6..6550694 100644 (file)
--- a/src/com/android/calendar/AlertService.java
+++ b/src/com/android/calendar/AlertService.java
@@ -427,11 +427,14 @@ public class AlertService extends Service {
     }
 
     @Override
-    public void onStart(Intent intent, int startId) {
-        Message msg = mServiceHandler.obtainMessage();
-        msg.arg1 = startId;
-        msg.obj = intent.getExtras();
-        mServiceHandler.sendMessage(msg);
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        if (intent != null) {
+            Message msg = mServiceHandler.obtainMessage();
+            msg.arg1 = startId;
+            msg.obj = intent.getExtras();
+            mServiceHandler.sendMessage(msg);
+        }
+        return START_REDELIVER_INTENT;
     }
 
     @Override