summaryrefslogtreecommitdiffstats
path: root/adb/shell_service_protocol.cpp
diff options
context:
space:
mode:
authorDavid Pursell <dpursell@google.com>2015-09-06 01:18:47 +0000
committerDavid Pursell <dpursell@google.com>2015-09-06 01:18:47 +0000
commitd9b74192b8351c99dc0baf53f6e652edb443d1d1 (patch)
treedc32f6889122a9b35c1a5d56e38033e82806e15a /adb/shell_service_protocol.cpp
parent73096f2e1d87da571187515af6aa7c2171a70693 (diff)
downloadsystem_core-d9b74192b8351c99dc0baf53f6e652edb443d1d1.tar.gz
system_core-d9b74192b8351c99dc0baf53f6e652edb443d1d1.tar.bz2
system_core-d9b74192b8351c99dc0baf53f6e652edb443d1d1.zip
Revert "adb: create shell protocol class."
This CL broke the mac build. I'll revert for now and take a look at how to get it working next week. This reverts commit 73096f2e1d87da571187515af6aa7c2171a70693. Change-Id: Icb3e015250bcbbc69a45675a1358699ebe01e77b
Diffstat (limited to 'adb/shell_service_protocol.cpp')
-rw-r--r--adb/shell_service_protocol.cpp62
1 files changed, 0 insertions, 62 deletions
diff --git a/adb/shell_service_protocol.cpp b/adb/shell_service_protocol.cpp
deleted file mode 100644
index 623629c75..000000000
--- a/adb/shell_service_protocol.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2015 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include "shell_service.h"
-
-#include <string.h>
-
-#include <algorithm>
-
-#include "adb_io.h"
-
-ShellProtocol::ShellProtocol(int fd) : fd_(fd) {
- buffer_[0] = kIdInvalid;
-}
-
-ShellProtocol::~ShellProtocol() {
-}
-
-bool ShellProtocol::Read() {
- // Only read a new header if we've finished the last packet.
- if (!bytes_left_) {
- if (!ReadFdExactly(fd_, buffer_, kHeaderSize)) {
- return false;
- }
-
- length_t packet_length;
- memcpy(&packet_length, &buffer_[1], sizeof(packet_length));
- bytes_left_ = packet_length;
- data_length_ = 0;
- }
-
- size_t read_length = std::min(bytes_left_, data_capacity());
- if (read_length && !ReadFdExactly(fd_, data(), read_length)) {
- return false;
- }
-
- bytes_left_ -= read_length;
- data_length_ = read_length;
-
- return true;
-}
-
-bool ShellProtocol::Write(Id id, size_t length) {
- buffer_[0] = id;
- length_t typed_length = length;
- memcpy(&buffer_[1], &typed_length, sizeof(typed_length));
-
- return WriteFdExactly(fd_, buffer_, kHeaderSize + length);
-}