ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adbd: switch abb to ConsumePrefix.

Browse source 
Test: mma
Change-Id: I57d1a30a526c97c5b5a2718740b76220da6eea39
This commit is contained in:
Josh Gao 2019-02-25 13:02:43 -08:00
parent aa4f31a124
commit ccc584523a
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
adb/daemon/abb.cpp
View file

@ -14,15 +14,15 @@
* limitations under the License.
*/
#include "adb.h"
#include "adb_io.h"
#include "shell_service.h"
#include "cmd.h"
#include <sys/wait.h>
#include <android-base/cmsg.h>
#include <cmd.h>
#include "adb.h"
#include "adb_io.h"
#include "adb_utils.h"
#include "shell_service.h"
namespace {
@ -87,11 +87,9 @@ int main(int argc, char* const argv[]) {
std::string_view name = data;
auto protocol = SubprocessProtocol::kShell;
if (name.starts_with("abb:")) {
name.remove_prefix(strlen("abb:"));
if (ConsumePrefix(&name, "abb:")) {
protocol = SubprocessProtocol::kShell;
} else if (name.starts_with("abb_exec:")) {
name.remove_prefix(strlen("abb_exec:"));
} else if (ConsumePrefix(&name, "abb_exec:")) {
protocol = SubprocessProtocol::kNone;
} else {
LOG(FATAL) << "Unknown command prefix for abb: " << data;