| commit | 1bd139a2a68690e80398b70b27ca59550fea0e65 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Tue Apr 03 14:19:20 2012 -0700 |
| committer | Andreas Huber <andih@google.com> | Tue Apr 03 14:19:20 2012 -0700 |
| tree | e3be78f22aa021c4e372409128775c2093d46dae | |
| parent | d22da88fd555f1262357c7dcdeface8445e3a012 [diff] [blame] |
New Crypto services talking to the new crypto "HAL". Change-Id: I69ed31e7a8b4d69d1209d2d516f94d258f072566 related-to-bug: 6275919
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index a977337..7c3fb0d 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -294,13 +294,7 @@ } sp<ICrypto> MediaPlayerService::makeCrypto() { - Mutex::Autolock autoLock(mLock); - - if (mCrypto == NULL) { - mCrypto = new Crypto; - } - - return mCrypto; + return new Crypto; } status_t MediaPlayerService::AudioCache::dump(int fd, const Vector<String16>& args) const