diff options
| author | Oliver Woodman <olly@google.com> | 2014-12-19 11:42:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-19 11:42:17 +0000 |
| commit | 9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5 (patch) | |
| tree | e80ef2101912296c4c70728ccacf64c58c2ca90c | |
| parent | 7e81cdef3625b52642969dd226a1446745e633e8 (diff) | |
| parent | 69fd01d3e6e8e94eafdb6d424f92a32ada93096d (diff) | |
| download | frameworks_base-9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5.zip frameworks_base-9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5.tar.gz frameworks_base-9aa5cb76f3b0486afcd9b3ff445d8d082793f2b5.tar.bz2 | |
am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev
* commit '69fd01d3e6e8e94eafdb6d424f92a32ada93096d':
MediaSessionLegacyHelper uses global Application context
| -rw-r--r-- | media/java/android/media/session/MediaSessionLegacyHelper.java | 5 |
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; |