Merge "Use HasSingletons for application singletons"

2 files changed, 14 insertions, 1 deletions

diff --git a/common/src/com/android/tv/common/BaseApplication.java b/common/src/com/android/tv/common/BaseApplication.java
index 6166b46b..566bd25b 100644
--- a/common/src/com/android/tv/common/BaseApplication.java
+++ b/common/src/com/android/tv/common/BaseApplication.java
@@ -40,7 +40,13 @@ public abstract class BaseApplication extends Application implements BaseSinglet
      */
     @VisibleForTesting public static BaseSingletons sSingletons;
 
-    /** Returns the {@link BaseSingletons} using the application context. */
+    /**
+     * Returns the {@link BaseSingletons} using the application context.
+     *
+     * @deprecated use {@link com.android.tv.common.singletons.HasSingletons#get(Class, Context)}
+     *     instead
+     */
+    @Deprecated
     public static BaseSingletons getSingletons(Context context) {
         // STOP-SHIP: changing the method to protected once the Tuner application is created.
         // No need to be "synchronized" because this doesn't create any instance.
diff --git a/common/src/com/android/tv/common/singletons/HasSingletons.java b/common/src/com/android/tv/common/singletons/HasSingletons.java
index b72ee4fc..193aed3a 100644
--- a/common/src/com/android/tv/common/singletons/HasSingletons.java
+++ b/common/src/com/android/tv/common/singletons/HasSingletons.java
@@ -15,12 +15,19 @@
  */
 package com.android.tv.common.singletons;
 
+import android.content.Context;
+
 /**
  * A type that can know about and supply a singleton, typically a type t such as an android activity
  * or application.
  */
 public interface HasSingletons<C> {
 
+    @SuppressWarnings("unchecked") // injection
+    static <C> C get(Class<C> clazz, Context context) {
+        return ((HasSingletons<C>) context).singletons();
+    }
+
     /** Returns the strongly typed singleton. */
     C singletons();
 }