summaryrefslogtreecommitdiffstats
path: root/media/java
diff options
context:
space:
mode:
authorOliver Woodman <olly@google.com>2014-12-19 11:37:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-12-19 11:37:04 +0000
commit69fd01d3e6e8e94eafdb6d424f92a32ada93096d (patch)
tree016899964b7b9d1ee7fe365540d1e0aa865bc9e3 /media/java
parent7b42f399430d5d4ace4efbee225bbd3ecd2d4146 (diff)
parent9b5257c9c99c4cb541d8e8e78fb04f008b1a9091 (diff)
downloadframeworks_base-69fd01d3e6e8e94eafdb6d424f92a32ada93096d.zip
frameworks_base-69fd01d3e6e8e94eafdb6d424f92a32ada93096d.tar.gz
frameworks_base-69fd01d3e6e8e94eafdb6d424f92a32ada93096d.tar.bz2
Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
Diffstat (limited to 'media/java')
-rw-r--r--media/java/android/media/session/MediaSessionLegacyHelper.java5
1 files changed, 1 insertions, 4 deletions
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 class MediaSessionLegacyHelper {
}
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;