commit 69fd01d3e6e8e94eafdb6d424f92a32ada93096d
author Oliver Woodman <olly@google.com> Fri Dec 19 11:37:01 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 19 11:37:04 2014 +0000
tree 016899964b7b9d1ee7fe365540d1e0aa865bc9e3
parent 7b42f399430d5d4ace4efbee225bbd3ecd2d4146
parent 9b5257c9c99c4cb541d8e8e78fb04f008b1a9091

Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev

media/java/android/media/session/MediaSessionLegacyHelper.java

diff --git a/media/java/android/media/session/MediaSessionLegacyHelper.java b/media/java/android/media/session/MediaSessionLegacyHelper.java
index 4b9a929..7ea269b 100644
--- a/media/java/android/media/session/MediaSessionLegacyHelper.java
+++ b/media/java/android/media/session/MediaSessionLegacyHelper.java
@@ -69,12 +69,9 @@
     }
 
     public static MediaSessionLegacyHelper getHelper(Context context) {
-        if (DEBUG) {
-            Log.d(TAG, "Attempting to get helper with context " + context);
-        }
         synchronized (sLock) {
             if (sInstance == null) {
-                sInstance = new MediaSessionLegacyHelper(context);
+                sInstance = new MediaSessionLegacyHelper(context.getApplicationContext());
             }
         }
         return sInstance;