commit 03fc55fed3e775acb3c7a53835f8660baa3354c3
author Tomasz Wasilczyk <twasilczyk@google.com> Fri Aug 11 17:05:05 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 16 21:32:49 2023 +0000
tree 034cd5fceb318b92aee178dd2e51b76e460b720c
parent 5d7b6569577ef9fd6450e6129b8391e306f441f5

Use String8/16 c_str (mainline modules)

Bug: 295394788
Test: make checkbuild
Change-Id: Ia266bccfc9100da25d8605d93c1298a341d2b11a

media/module/service.mediatranscoding/MediaTranscodingService.cpp

diff --git a/media/module/service.mediatranscoding/MediaTranscodingService.cpp b/media/module/service.mediatranscoding/MediaTranscodingService.cpp
index 2a20981..2c73f3e 100644
--- a/media/module/service.mediatranscoding/MediaTranscodingService.cpp
+++ b/media/module/service.mediatranscoding/MediaTranscodingService.cpp
@@ -110,7 +110,7 @@
                     "Permission Denial: "
                     "can't dump MediaTranscodingService from pid=%d, uid=%d\n",
                     AIBinder_getCallingPid(), AIBinder_getCallingUid());
-            write(fd, result.string(), result.size());
+            write(fd, result.c_str(), result.size());
             return PERMISSION_DENIED;
         }
     }
@@ -120,7 +120,7 @@
 
     snprintf(buffer, SIZE, "MediaTranscodingService: %p\n", this);
     result.append(buffer);
-    write(fd, result.string(), result.size());
+    write(fd, result.c_str(), result.size());
 
     Vector<String16> args;
     mClientManager->dumpAllClients(fd, args);

media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h

diff --git a/media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h b/media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
index 8e17f55..723bd77 100644
--- a/media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
+++ b/media/module/service.mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
@@ -76,7 +76,7 @@
     PermissionController pc;
     uid = pc.getPackageUid(packageName, 0);
     if (uid <= 0) {
-        ALOGE("Unknown package: '%s'", String8(packageName).string());
+        ALOGE("Unknown package: '%s'", String8(packageName).c_str());
         return BAD_VALUE;
     }