commit d11972f8d48d14a1a52e98e64b8216abfc7f00e0
author Marco Nelissen <marcone@google.com> Wed Feb 24 21:37:05 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed Feb 24 21:37:05 2016 +0000
tree 513d2cd1a96344f2f505defaeeffbe0188088e48
parent 776aacce9e5e2dfbc4e7a955916ea0d397af74bf
parent 93f5bcab205f8d7cd4557eacda513867e8b8ea65

Get service by value instead of reference am: 61a6d26aab
am: 93f5bcab20

* commit '93f5bcab205f8d7cd4557eacda513867e8b8ea65':
  Get service by value instead of reference

include/media/mediametadataretriever.h

diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h
index b35cf32..84b9846 100644
--- a/include/media/mediametadataretriever.h
+++ b/include/media/mediametadataretriever.h
@@ -79,7 +79,7 @@
     const char* extractMetadata(int keyCode);
 
 private:
-    static const sp<IMediaPlayerService>& getService();
+    static const sp<IMediaPlayerService> getService();
 
     class DeathNotifier: public IBinder::DeathRecipient
     {

media/libmedia/mediametadataretriever.cpp

diff --git a/media/libmedia/mediametadataretriever.cpp b/media/libmedia/mediametadataretriever.cpp
index 39a239d..67d4139 100644
--- a/media/libmedia/mediametadataretriever.cpp
+++ b/media/libmedia/mediametadataretriever.cpp
@@ -35,7 +35,7 @@
 sp<IMediaPlayerService> MediaMetadataRetriever::sService;
 sp<MediaMetadataRetriever::DeathNotifier> MediaMetadataRetriever::sDeathNotifier;
 
-const sp<IMediaPlayerService>& MediaMetadataRetriever::getService()
+const sp<IMediaPlayerService> MediaMetadataRetriever::getService()
 {
     Mutex::Autolock lock(sServiceLock);
     if (sService == 0) {
@@ -62,7 +62,7 @@
 MediaMetadataRetriever::MediaMetadataRetriever()
 {
     ALOGV("constructor");
-    const sp<IMediaPlayerService>& service(getService());
+    const sp<IMediaPlayerService> service(getService());
     if (service == 0) {
         ALOGE("failed to obtain MediaMetadataRetrieverService");
         return;