Snap for 10900817 from 7460e8f6f51d1c42dce71907a24f3ec603c63285 to sdk-releaseplatform-tools-34.0.5

Change-Id: Ib2eaac1a0f54da84e8297d1b6d79a445f7e9222d

1 files changed, 7 insertions, 7 deletions

diff --git a/media/eco/ECOSession.cpp b/media/eco/ECOSession.cpp
index 1a2e910..e6eb2b0 100644
--- a/media/eco/ECOSession.cpp
+++ b/media/eco/ECOSession.cpp
@@ -381,7 +381,7 @@ Status ECOSession::addStatsProvider(
         return STATUS_ERROR(ERROR_PERMISSION_DENIED, "Failed to get provider name");
     }
 
-    ECOLOGV("Try to add stats provider name: %s uid: %d pid %d", ::android::String8(name).string(),
+    ECOLOGV("Try to add stats provider name: %s uid: %d pid %d", ::android::String8(name).c_str(),
             IPCThreadState::self()->getCallingUid(), IPCThreadState::self()->getCallingPid());
 
     if (provider == nullptr) {
@@ -397,10 +397,10 @@ Status ECOSession::addStatsProvider(
         mProvider->getName(&name);
         String8 errorMsg = String8::format(
                 "ECOService 1.0 only supports one stats provider, current provider: %s",
-                ::android::String8(name).string());
-        ECOLOGE("%s", errorMsg.string());
+                ::android::String8(name).c_str());
+        ECOLOGE("%s", errorMsg.c_str());
         *status = false;
-        return STATUS_ERROR(ERROR_ALREADY_EXISTS, errorMsg.string());
+        return STATUS_ERROR(ERROR_ALREADY_EXISTS, errorMsg.c_str());
     }
 
     // TODO: Handle the provider config.
@@ -482,7 +482,7 @@ Status ECOSession::addInfoListener(
         return STATUS_ERROR(ERROR_ILLEGAL_ARGUMENT, "listener config is not valid");
     }
 
-    ECOLOGD("Info listener name: %s uid: %d pid %d", ::android::String8(name).string(),
+    ECOLOGD("Info listener name: %s uid: %d pid %d", ::android::String8(name).c_str(),
             IPCThreadState::self()->getCallingUid(), IPCThreadState::self()->getCallingPid());
 
     mListener = listener;
@@ -556,10 +556,10 @@ status_t ECOSession::dump(int fd, const Vector<String16>& /*args*/) {
             mWidth, mHeight, mIsCameraRecording, mTargetBitrateBps, mCodecType, mCodecProfile,
             mCodecLevel);
     if (mProvider != nullptr) {
-        dprintf(fd, "Provider: %s \n", ::android::String8(mProviderName).string());
+        dprintf(fd, "Provider: %s \n", ::android::String8(mProviderName).c_str());
     }
     if (mListener != nullptr) {
-        dprintf(fd, "Listener: %s \n", ::android::String8(mListenerName).string());
+        dprintf(fd, "Listener: %s \n", ::android::String8(mListenerName).c_str());
     }
     dprintf(fd, "\n===================\n\n");