commit f2b1de4ffe9a56494d2d70438f57609d7aecc9a5
author Christopher Dombroski <cdombroski@google.com> Thu Mar 21 14:44:51 2019 -0700
committer Christopher Dombroski <cdombroski@google.com> Thu Mar 21 23:16:57 2019 +0000
tree 79facb23a7949516ab628aeee908d926748be9bf
parent e1c265dc752253f1a0865bcdbfc34f5fba9e0e22

[RESTRICT AUTOMERGE]: CTS test fix for Android Security CVE-2019-2004

This file has multiple inconsistencies across branches.
This is cleaning it up.

Bug: 115739809
Bug: 120630087
Test: cts-tradefed run cts -m CtsSecurityBulletinHostTestCases -t android.security.cts.Poc19_03#testPocBug_115739809
Change-Id: Iaee64da04578f33ce6161dc15f7bf9735582c770

hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp

diff --git a/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp b/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
index 54e70cb1..761e529 100755
--- a/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
@@ -190,7 +190,7 @@
 int main() {
     sp<InputChannel> server, client;
 
-    status_t result = InputChannel::openInputChannelPair(String8("channel name").string(), server, client);
+    status_t result = InputChannel::openInputChannelPair("channel name", server, client);
     if (result != OK) {
         ALOGE("Could not open input channel pair");
         return 0;