summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-12-18 15:04:25 -0800
committerJean-Michel Trivi <jmtrivi@google.com>2014-12-18 16:42:59 -0800
commit9b5257c9c99c4cb541d8e8e78fb04f008b1a9091 (patch)
tree8bd26f0d1a68d38e3373b0f10e4f200e8939205d /media
parent296aa925171b27a87b427575a9a462dc8a8620b2 (diff)
downloadframeworks_base-9b5257c9c99c4cb541d8e8e78fb04f008b1a9091.zip
frameworks_base-9b5257c9c99c4cb541d8e8e78fb04f008b1a9091.tar.gz
frameworks_base-9b5257c9c99c4cb541d8e8e78fb04f008b1a9091.tar.bz2
MediaSessionLegacyHelper uses global Application context
MediaSessionLegacyHelper used a Context passed by an application which can cause a leak of Activity instances. Use the global Application context instead. Also prevent crash if a null Context is supplied (method not documented as requesting a non-null Context). Bug 18767503 Change-Id: I8281047d0af233a323f3fc11ababedff848829ec
Diffstat (limited to 'media')
-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;