Add binder to context analyser service

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/ContextAnalyserService.java

@@ -24,14 +24,14 @@ package uk.co.md87.android.contextanalyser;
 
 import android.app.Service;
 import android.content.Intent;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.location.Address;
 import android.location.Geocoder;
 import android.location.Location;
 import android.os.Handler;
 import android.os.IBinder;
-import android.telephony.TelephonyManager;
+import android.os.RemoteException;
 import android.util.Log;
+
 import com.flurry.android.FlurryAgent;
 
 import java.io.IOException;
@@ -41,8 +41,8 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import uk.co.md87.android.common.ExceptionHandler;
 
+import uk.co.md87.android.common.ExceptionHandler;
 import uk.co.md87.android.common.ModelReader;
 import uk.co.md87.android.common.accel.AccelReaderFactory;
 import uk.co.md87.android.common.aggregator.AutoAggregator;
@@ -52,6 +52,7 @@ import uk.co.md87.android.common.geo.LocationMonitorFactory;
 import uk.co.md87.android.common.model.Journey;
 import uk.co.md87.android.common.model.JourneyStep;
 import uk.co.md87.android.common.model.Place;
+import uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder;
 
 /**
  * Background service which monitors and aggregates various sources of
@@ -89,6 +90,13 @@ public class ContextAnalyserService extends Service {
         }
     };
 
+    private final ContextAnalyserBinder.Stub binder = new ContextAnalyserBinder.Stub() {
+
+        public String getActivity() throws RemoteException {
+            return lastActivity;
+        }
+    };
+
     private final Map<String, Long> names = new HashMap<String, Long>();
     private final List<String> activityLog = new LinkedList<String>();
 
@@ -322,7 +330,7 @@ public class ContextAnalyserService extends Service {
 
     @Override
     public IBinder onBind(Intent arg0) {
-        return null;
+        return binder;
     }
 
 }

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/rpc/ContextAnalyserBinder.aidl

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2009-2010 Chris Smith
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package uk.co.md87.android.contextanalyser.rpc;
+
+/**
+ * Interface to facilitate RPC with the context analyser service.
+ *
+ * @author chris
+ */
+interface ContextAnalyserBinder {
+
+    String getActivity();
+
+}

code/ContextAnalyser/src/uk/co/md87/android/contextanalyser/rpc/ContextAnalyserBinder.java

@@ -0,0 +1,103 @@
+/*
+ * This file is auto-generated.  DO NOT MODIFY.
+ * Original file: uk/co/md87/android/contextanalyser/rpc/ContextAnalyserBinder.aidl
+ */
+package uk.co.md87.android.contextanalyser.rpc;
+import java.lang.String;
+import android.os.RemoteException;
+import android.os.IBinder;
+import android.os.IInterface;
+import android.os.Binder;
+import android.os.Parcel;
+/**
+ * Interface to facilitate RPC with the context analyser service.
+ *
+ * @author chris
+ */
+public interface ContextAnalyserBinder extends android.os.IInterface
+{
+/** Local-side IPC implementation stub class. */
+public static abstract class Stub extends android.os.Binder implements uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder
+{
+private static final java.lang.String DESCRIPTOR = "uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder";
+/** Construct the stub at attach it to the interface. */
+public Stub()
+{
+this.attachInterface(this, DESCRIPTOR);
+}
+/**
+ * Cast an IBinder object into an ContextAnalyserBinder interface,
+ * generating a proxy if needed.
+ */
+public static uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder asInterface(android.os.IBinder obj)
+{
+if ((obj==null)) {
+return null;
+}
+android.os.IInterface iin = (android.os.IInterface)obj.queryLocalInterface(DESCRIPTOR);
+if (((iin!=null)&&(iin instanceof uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder))) {
+return ((uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder)iin);
+}
+return new uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder.Stub.Proxy(obj);
+}
+public android.os.IBinder asBinder()
+{
+return this;
+}
+@Override public boolean onTransact(int code, android.os.Parcel data, android.os.Parcel reply, int flags) throws android.os.RemoteException
+{
+switch (code)
+{
+case INTERFACE_TRANSACTION:
+{
+reply.writeString(DESCRIPTOR);
+return true;
+}
+case TRANSACTION_getActivity:
+{
+data.enforceInterface(DESCRIPTOR);
+java.lang.String _result = this.getActivity();
+reply.writeNoException();
+reply.writeString(_result);
+return true;
+}
+}
+return super.onTransact(code, data, reply, flags);
+}
+private static class Proxy implements uk.co.md87.android.contextanalyser.rpc.ContextAnalyserBinder
+{
+private android.os.IBinder mRemote;
+Proxy(android.os.IBinder remote)
+{
+mRemote = remote;
+}
+public android.os.IBinder asBinder()
+{
+return mRemote;
+}
+public java.lang.String getInterfaceDescriptor()
+{
+return DESCRIPTOR;
+}
+public java.lang.String getActivity() throws android.os.RemoteException
+{
+android.os.Parcel _data = android.os.Parcel.obtain();
+android.os.Parcel _reply = android.os.Parcel.obtain();
+java.lang.String _result;
+try {
+_data.writeInterfaceToken(DESCRIPTOR);
+mRemote.transact(Stub.TRANSACTION_getActivity, _data, _reply, 0);
+_reply.readException();
+_result = _reply.readString();
+}
+finally {
+_reply.recycle();
+_data.recycle();
+}
+return _result;
+}
+}
+static final int TRANSACTION_getActivity = (IBinder.FIRST_CALL_TRANSACTION + 0);
+}
+public java.lang.String getActivity() throws android.os.RemoteException;
+}