am 9aa5cb76: am 69fd01d3: Merge "MediaSessionLegacyHelper uses global Application context" into lmp-mr1-dev

automerge: 20e52c3

* commit '20e52c3453b2683cccfc4ac0841c9d6ef0796f88':
  MediaSessionLegacyHelper uses global Application context
This commit is contained in:
Oliver Woodman
2014-12-19 11:49:15 +00:00
committed by android-build-merger

View File

@@ -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;