commit 56ef88d6219f624d8c50424c28a77d7d27166157
author Eric Laurent <elaurent@google.com> Tue Apr 21 16:58:06 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 21 16:58:07 2015 +0000
tree 45efe5950d4d5d353040291a1f71e7fb88e48d1c
parent 467753a4b7bd45a99f75dbc9b67daea9f2c1ba49
parent a7401cc5e781da150b46e7ae37905ab9ca2aa758

Merge "audio policy: remove permission check for ports and patches getters"

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 87003c5..3bc763f 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -746,7 +746,7 @@
         return UNKNOWN_ERROR;
     }
 
-    ALOGV("st_dev  = %llu", sb.st_dev);
+    ALOGV("st_dev  = %llu", static_cast<uint64_t>(sb.st_dev));
     ALOGV("st_mode = %u", sb.st_mode);
     ALOGV("st_uid  = %lu", static_cast<unsigned long>(sb.st_uid));
     ALOGV("st_gid  = %lu", static_cast<unsigned long>(sb.st_gid));

media/libmediaplayerservice/MetadataRetrieverClient.cpp

diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
index 6ef4c1f..9a37302 100644
--- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp
+++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp
@@ -141,7 +141,7 @@
         ALOGE("fstat(%d) failed: %d, %s", fd, ret, strerror(errno));
         return BAD_VALUE;
     }
-    ALOGV("st_dev  = %llu", sb.st_dev);
+    ALOGV("st_dev  = %llu", static_cast<uint64_t>(sb.st_dev));
     ALOGV("st_mode = %u", sb.st_mode);
     ALOGV("st_uid  = %lu", static_cast<unsigned long>(sb.st_uid));
     ALOGV("st_gid  = %lu", static_cast<unsigned long>(sb.st_gid));

media/libstagefright/MediaCodec.cpp

diff --git a/media/libstagefright/MediaCodec.cpp b/media/libstagefright/MediaCodec.cpp
index 5ae79e6..93864e4 100644
--- a/media/libstagefright/MediaCodec.cpp
+++ b/media/libstagefright/MediaCodec.cpp
@@ -236,11 +236,7 @@
         ALOGE("Failed to get ResourceManagerService");
         return;
     }
-    if (IInterface::asBinder(mService)->linkToDeath(this) != OK) {
-        mService.clear();
-        ALOGE("Failed to linkToDeath to ResourceManagerService.");
-        return;
-    }
+    IInterface::asBinder(mService)->linkToDeath(this);
 }
 
 void MediaCodec::ResourceManagerServiceProxy::binderDied(const wp<IBinder>& /*who*/) {