1 files changed, 0 insertions, 33 deletions
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index bb32ac2e..17aaff1b 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -35,7 +35,6 @@ import android.app.FragmentTransaction;
 import android.app.LoaderManager;
 import android.content.AsyncQueryHandler;
 import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.Context;
@@ -43,7 +42,6 @@ import android.content.CursorLoader;
 import android.content.DialogInterface;
 import android.content.Loader;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.content.res.Configuration;
@@ -54,7 +52,6 @@ import android.graphics.drawable.LayerDrawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.IBinder;
 import android.provider.CalendarContract;
 import android.provider.CalendarContract.Attendees;
 import android.provider.CalendarContract.Calendars;
@@ -83,8 +80,6 @@ import com.android.calendar.CalendarController.ViewType;
 import com.android.calendar.agenda.AgendaFragment;
 import com.android.calendar.month.MonthByWeekFragment;
 import com.android.calendar.selectcalendars.SelectVisibleCalendarsFragment;
-import com.android.lunar.ILunarService;
-import com.android.lunar.LunarUtils;
 
 import java.io.IOException;
 import java.util.Calendar;
@@ -183,23 +178,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
     private AllInOneMenuExtensionsInterface mExtensions = ExtensionsFactory
             .getAllInOneMenuExtensions();
 
-    // To connect the lunar service
-    private ILunarService mLunarService = null;
-    private ServiceConnection mLunarConnection = new ServiceConnection() {
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            mLunarService = null;
-            LunarUtils.setService(null);
-        }
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mLunarService = ILunarService.Stub.asInterface(service);
-            LunarUtils.setService(mLunarService);
-        }
-    };
-
     private final AnimatorListener mSlideAnimationDoneListener = new AnimatorListener() {
 
         @Override
@@ -340,12 +318,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
         }
         super.onCreate(icicle);
 
-        // Bind the lunar service
-        if (LunarUtils.showLunar() && mLunarService == null) {
-            bindService(new Intent(ILunarService.class.getName()), mLunarConnection,
-                    Context.BIND_AUTO_CREATE);
-        }
-
         if (icicle != null && icicle.containsKey(BUNDLE_KEY_CHECK_ACCOUNTS)) {
             mCheckForAccounts = icicle.getBoolean(BUNDLE_KEY_CHECK_ACCOUNTS);
         }
@@ -655,11 +627,6 @@ public class AllInOneActivity extends AbstractCalendarActivity implements EventH
     protected void onDestroy() {
         super.onDestroy();
 
-        // Unbind the lunar service
-        if (mLunarService != null && mLunarConnection != null) {
-            unbindService(mLunarConnection);
-        }
-
         SharedPreferences prefs = GeneralPreferences.getSharedPreferences(this);
         prefs.unregisterOnSharedPreferenceChangeListener(this);