Integrate CallerInfo with notifications

- Allow notifications to use network URIs for avatar icons.
- Implement redirect following in network URI requests.
- Refactor lookup API

Change-Id: Ica61c7aadac1d32dc9d04785f381abf9e0fb1441
issue-id: OPO-725

1 files changed, 19 insertions, 5 deletions

diff --git a/src/com/android/messaging/BugleApplication.java b/src/com/android/messaging/BugleApplication.java
index c95d75e..3e9cef2 100644
--- a/src/com/android/messaging/BugleApplication.java
+++ b/src/com/android/messaging/BugleApplication.java
@@ -64,7 +64,7 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
     private static boolean sRunningTests = false;
 
     // Lookup provider members
-    private static LookupProviderManager mLookupProviderManager;
+    private static LookupProviderManager sLookupProviderManager;
 
     @VisibleForTesting
     protected static void setTestsRunning() {
@@ -105,7 +105,7 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
 
 
         Trace.endSection();
-        mLookupProviderManager = new LookupProviderManager(this);
+        sLookupProviderManager = new LookupProviderManager(this);
     }
 
     @Override
@@ -198,7 +198,7 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
             LogUtil.d(TAG, "BugleApplication.onLowMemory");
         }
         Factory.get().reclaimMemory();
-        mLookupProviderManager.onLowMemory();
+        sLookupProviderManager.onLowMemory();
     }
 
     @Override
@@ -286,8 +286,22 @@ public class BugleApplication extends Application implements UncaughtExceptionHa
      *
      * @return {@link ILookupClient} or null
      */
-    public static ILookupClient getLookupProviderClient() {
-        return mLookupProviderManager;
+    public static ILookupClient getLookupProvider() {
+        return sLookupProviderManager;
     }
 
+    /**
+     * Notify the provider that you would like to use it. Must be followed by
+     * {@link #releaseLookupProvider()} when you are finished, so client can clean up.
+     */
+    public static void acquireLookupProvider() {
+        sLookupProviderManager.onConsumerActivated();
+    }
+
+    /**
+     * Notify the provider that you are finished using it.
+     */
+    public static void releaseLookupProvider() {
+        sLookupProviderManager.onConsumerDeactivated();
+    }
 }