Changes needed for android merge. Exposing several bundle contexts. Some public constants. Changes in sound notifications to use String as resource uri, and obtaining resource input stream and stream format info from AudioSystem, so it can be overridden in different implementations.

1 files changed, 15 insertions, 0 deletions

diff --git a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
index 923c699..665bbcb 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
+++ b/src/net/java/sip/communicator/impl/sysactivity/SysActivityActivator.java
@@ -27,6 +27,11 @@ public class SysActivityActivator
     private final Logger logger = Logger.getLogger(SysActivityActivator.class);

 

     /**

+     * The OSGi <tt>BundleContext</tt>.

+     */

+    private static BundleContext bundleContext = null;

+

+    /**

      * The system activity service impl.

      */

     private static SystemActivityNotificationsServiceImpl

@@ -84,4 +89,14 @@ public class SysActivityActivator
         if (sysActivitiesServiceImpl != null)

             sysActivitiesServiceImpl.stop();

     }

+

+    /**

+     * Returns a reference to the bundle context that we were started with.

+     * @return a reference to the BundleContext instance that we were started

+     * with.

+     */

+    public static BundleContext getBundleContext()

+    {

+        return bundleContext;

+    }

 }