Merge "libcutils: fs_config.c code compliance"
diff --git a/adb/bugreport.cpp b/adb/bugreport.cpp
index a5c312b..9dc9811 100644
--- a/adb/bugreport.cpp
+++ b/adb/bugreport.cpp
@@ -47,7 +47,8 @@
invalid_lines_(),
show_progress_(show_progress),
status_(0),
- line_() {
+ line_(),
+ last_progress_(0) {
SetLineMessage("generating");
}
@@ -66,6 +67,7 @@
void OnStderr(const char* buffer, int length) {
OnStream(nullptr, stderr, buffer, length);
}
+
int Done(int unused_) {
// Process remaining line, if any.
ProcessLine(line_);
@@ -145,6 +147,11 @@
size_t idx1 = line.rfind(BUGZ_PROGRESS_PREFIX) + strlen(BUGZ_PROGRESS_PREFIX);
size_t idx2 = line.rfind(BUGZ_PROGRESS_SEPARATOR);
int progress = std::stoi(line.substr(idx1, (idx2 - idx1)));
+ if (progress <= last_progress_) {
+ // Ignore.
+ return;
+ }
+ last_progress_ = progress;
int total = std::stoi(line.substr(idx2 + 1));
br_->UpdateProgress(line_message_, progress, total);
} else {
@@ -180,6 +187,10 @@
// Temporary buffer containing the characters read since the last newline (\n).
std::string line_;
+ // Last displayed progress.
+ // Since dumpstate progress can recede, only forward progress should be displayed
+ int last_progress_;
+
DISALLOW_COPY_AND_ASSIGN(BugreportStandardStreamsCallback);
};
diff --git a/adb/bugreport_test.cpp b/adb/bugreport_test.cpp
index 1129285..b500c49 100644
--- a/adb/bugreport_test.cpp
+++ b/adb/bugreport_test.cpp
@@ -50,9 +50,7 @@
// Empty functions so tests don't need to be linked against commandline.cpp
DefaultStandardStreamsCallback DEFAULT_STANDARD_STREAMS_CALLBACK(nullptr, nullptr);
-int usage() {
- return -42;
-}
+
int send_shell_command(TransportType transport_type, const char* serial, const std::string& command,
bool disable_shell_protocol, StandardStreamsCallbackInterface* callback) {
ADD_FAILURE() << "send_shell_command() should have been mocked";
@@ -155,7 +153,7 @@
// Tests when called with invalid number of arguments
TEST_F(BugreportTest, InvalidNumberArgs) {
const char* args[] = {"bugreport", "to", "principal"};
- ASSERT_EQ(-42, br_.DoIt(kTransportLocal, "HannibalLecter", 3, args));
+ ASSERT_EQ(1, br_.DoIt(kTransportLocal, "HannibalLecter", 3, args));
}
// Tests the 'adb bugreport' option when the device does not support 'bugreportz' - it falls back
@@ -282,6 +280,35 @@
ASSERT_EQ(0, br_.DoIt(kTransportLocal, "HannibalLecter", 2, args));
}
+// Tests 'adb bugreport file.zip' when it succeeds and displays progress, even if progress recedes.
+TEST_F(BugreportTest, OkProgressAlwaysForward) {
+ ExpectBugreportzVersion("1.1");
+ ExpectProgress(1, 100);
+ ExpectProgress(50, 100);
+ ExpectProgress(75, 100);
+ // clang-format off
+ EXPECT_CALL(br_, SendShellCommand(kTransportLocal, "HannibalLecter", "bugreportz -p", false, _))
+ // NOTE: DoAll accepts at most 10 arguments, and we're almost reached that limit...
+ .WillOnce(DoAll(
+ WithArg<4>(WriteOnStdout("BEGIN:/device/bugreport.zip\n")),
+ WithArg<4>(WriteOnStdout("PROGRESS:1/100\n")),
+ WithArg<4>(WriteOnStdout("PROGRESS:50/100\n")),
+ // 25 should be ignored becaused it receded.
+ WithArg<4>(WriteOnStdout("PROGRESS:25/100\n")),
+ WithArg<4>(WriteOnStdout("PROGRESS:75/100\n")),
+ // 75 should be ignored becaused it didn't change.
+ WithArg<4>(WriteOnStdout("PROGRESS:75/100\n")),
+ WithArg<4>(WriteOnStdout("OK:/device/bugreport.zip")),
+ WithArg<4>(ReturnCallbackDone())));
+ // clang-format on
+ EXPECT_CALL(br_, DoSyncPull(ElementsAre(StrEq("/device/bugreport.zip")), StrEq("file.zip"),
+ true, StrEq("pulling file.zip")))
+ .WillOnce(Return(true));
+
+ const char* args[] = {"bugreport", "file.zip"};
+ ASSERT_EQ(0, br_.DoIt(kTransportLocal, "HannibalLecter", 2, args));
+}
+
// Tests 'adb bugreport dir' when it succeeds and destination is a directory.
TEST_F(BugreportTest, OkDirectory) {
ExpectBugreportzVersion("1.1");
diff --git a/adb/jdwp_service.cpp b/adb/jdwp_service.cpp
index af911bf..f0dff06 100644
--- a/adb/jdwp_service.cpp
+++ b/adb/jdwp_service.cpp
@@ -179,8 +179,6 @@
fdevent* fde = nullptr;
std::vector<unique_fd> out_fds;
- char in_buf[PID_LEN + 1];
- ssize_t in_len = 0;
};
static size_t jdwp_process_list(char* buffer, size_t bufferlen) {
@@ -224,29 +222,16 @@
if (events & FDE_READ) {
if (proc->pid < 0) {
/* read the PID as a 4-hexchar string */
- if (proc->in_len < 0) {
- fatal("attempting to read JDWP pid again?");
- }
-
- char* p = proc->in_buf + proc->in_len;
- size_t size = PID_LEN - proc->in_len;
-
- ssize_t rc = TEMP_FAILURE_RETRY(recv(socket, p, size, 0));
- if (rc <= 0) {
+ char buf[PID_LEN + 1];
+ ssize_t rc = TEMP_FAILURE_RETRY(recv(socket, buf, PID_LEN, 0));
+ if (rc != PID_LEN) {
D("failed to read jdwp pid: %s", strerror(errno));
goto CloseProcess;
}
+ buf[PID_LEN] = '\0';
- proc->in_len += rc;
- if (proc->in_len != PID_LEN) {
- return;
- }
-
- proc->in_buf[PID_LEN] = '\0';
- proc->in_len = -1;
-
- if (sscanf(proc->in_buf, "%04x", &proc->pid) != 1) {
- D("could not decode JDWP %p PID number: '%s'", proc, p);
+ if (sscanf(buf, "%04x", &proc->pid) != 1) {
+ D("could not decode JDWP %p PID number: '%s'", proc, buf);
goto CloseProcess;
}
@@ -401,7 +386,7 @@
addr.sun_family = AF_UNIX;
memcpy(addr.sun_path, sockname, socknamelen);
- s = socket(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+ s = socket(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC, 0);
if (s < 0) {
D("could not create vm debug control socket. %d: %s", errno, strerror(errno));
return -1;
diff --git a/include/private/android_filesystem_config.h b/include/private/android_filesystem_config.h
index 48a0e61..d200070 100644
--- a/include/private/android_filesystem_config.h
+++ b/include/private/android_filesystem_config.h
@@ -129,6 +129,7 @@
#define AID_TOMBSTONED 1058 /* tombstoned user */
#define AID_MEDIA_OBB 1059 /* GID for OBB files on internal media storage */
#define AID_ESE 1060 /* embedded secure element (eSE) subsystem */
+#define AID_OTA_UPDATE 1061 /* resource tracking UID for OTA updates */
/* Changes to this file must be made in AOSP, *not* in internal branches. */
#define AID_SHELL 2000 /* adb and debug shell user */