commit d0f4bfb5527e88e868c4263cb6c9d219367b9fc9
author Marco Nelissen <marcone@google.com> Tue Jun 07 12:26:43 2016 -0700
committer Marco Nelissen <marcone@google.com> Wed Jun 08 17:10:39 2016 -0700
tree 69301a8556126d12747adc0544dc57a8c389d97a
parent 33e914c861732cbcca923d34d368e1635b68434f

Don't use sp<>&

because they may end up pointing to NULL after a NULL check was performed.

Bug: 28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe

media/libmedia/mediaplayer.cpp

diff --git a/media/libmedia/mediaplayer.cpp b/media/libmedia/mediaplayer.cpp
index 9611ac7..357ef85 100644
--- a/media/libmedia/mediaplayer.cpp
+++ b/media/libmedia/mediaplayer.cpp
@@ -149,7 +149,7 @@
     ALOGV("setDataSource(%s)", url);
     status_t err = BAD_VALUE;
     if (url != NULL) {
-        const sp<IMediaPlayerService>& service(getMediaPlayerService());
+        const sp<IMediaPlayerService> service(getMediaPlayerService());
         if (service != 0) {
             sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
             if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -166,7 +166,7 @@
 {
     ALOGV("setDataSource(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);
     status_t err = UNKNOWN_ERROR;
-    const sp<IMediaPlayerService>& service(getMediaPlayerService());
+    const sp<IMediaPlayerService> service(getMediaPlayerService());
     if (service != 0) {
         sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
         if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -182,7 +182,7 @@
 {
     ALOGV("setDataSource");
     status_t err = UNKNOWN_ERROR;
-    const sp<IMediaPlayerService>& service(getMediaPlayerService());
+    const sp<IMediaPlayerService> service(getMediaPlayerService());
     if (service != 0) {
         sp<IMediaPlayer> player(service->create(this, mAudioSessionId));
         if ((NO_ERROR != doSetRetransmitEndpoint(player)) ||
@@ -846,7 +846,7 @@
 {
     ALOGV("decode(%s)", url);
     status_t status;
-    const sp<IMediaPlayerService>& service = getMediaPlayerService();
+    const sp<IMediaPlayerService> service = getMediaPlayerService();
     if (service != 0) {
         status = service->decode(httpService, url, pSampleRate, pNumChannels, pFormat, heap, pSize);
     } else {
@@ -870,7 +870,7 @@
 {
     ALOGV("decode(%d, %" PRId64 ", %" PRId64 ")", fd, offset, length);
     status_t status;
-    const sp<IMediaPlayerService>& service = getMediaPlayerService();
+    const sp<IMediaPlayerService> service = getMediaPlayerService();
     if (service != 0) {
         status = service->decode(fd, offset, length, pSampleRate,
                                  pNumChannels, pFormat, heap, pSize);