diff options
| author | 2019-02-25 11:58:32 -0800 | |
|---|---|---|
| committer | 2019-02-25 11:58:32 -0800 | |
| commit | 9a86c63f24b0e326d24d04e4f15ce722ee313c8c (patch) | |
| tree | a11e00fbed2ebb1bc233fd861d8bad61db1c0a22 | |
| parent | c48622808337c0c1f1878d7b5fa571e3536c917d (diff) | |
| parent | c6c5cdde65037762094ad22e694e8ae45565e33c (diff) | |
Merge "Rename IDumpstateListener errorcode" am: d7d075fbf6 am: c943242ff9
am: c6c5cdde65
Change-Id: I898f3d7363946d9fdda92afac5babf43b5ef2dc1
| -rw-r--r-- | cmds/dumpstate/DumpstateService.cpp | 2 | ||||
| -rw-r--r-- | cmds/dumpstate/binder/android/os/IDumpstateListener.aidl | 2 | ||||
| -rw-r--r-- | cmds/dumpstate/tests/dumpstate_smoke_test.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmds/dumpstate/DumpstateService.cpp b/cmds/dumpstate/DumpstateService.cpp index 768cb4f2f6..ddae9ea8f6 100644 --- a/cmds/dumpstate/DumpstateService.cpp +++ b/cmds/dumpstate/DumpstateService.cpp @@ -127,7 +127,7 @@ binder::Status DumpstateService::startBugreport(int32_t calling_uid, if (ds_ != nullptr) { MYLOGE("Error! There is already a bugreport in progress. Returning."); if (listener != nullptr) { - listener->onError(IDumpstateListener::BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN); + listener->onError(IDumpstateListener::BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS); } return exception(binder::Status::EX_SERVICE_SPECIFIC, "There is already a bugreport in progress"); diff --git a/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl b/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl index 42858e0827..ea1e467dca 100644 --- a/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl +++ b/cmds/dumpstate/binder/android/os/IDumpstateListener.aidl @@ -50,7 +50,7 @@ interface IDumpstateListener { const int BUGREPORT_ERROR_USER_CONSENT_TIMED_OUT = 4; /* There is currently a bugreport running. The caller should try again later. */ - const int BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN = 5; + const int BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS = 5; /** * Called on an error condition with one of the error codes listed above. diff --git a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp index 555badd61b..fc3642c912 100644 --- a/cmds/dumpstate/tests/dumpstate_smoke_test.cpp +++ b/cmds/dumpstate/tests/dumpstate_smoke_test.cpp @@ -475,7 +475,7 @@ TEST_F(DumpstateBinderTest, SimultaneousBugreportsNotAllowed) { EXPECT_FALSE(status.isOk()); WaitTillExecutionComplete(listener2.get()); EXPECT_EQ(listener2->getErrorCode(), - IDumpstateListener::BUGREPORT_ERROR_CONCURRENT_BUGREPORTS_FORBIDDEN); + IDumpstateListener::BUGREPORT_ERROR_ANOTHER_REPORT_IN_PROGRESS); // Meanwhile the first call works as expected. Service should not die in this case. WaitTillExecutionComplete(listener1.get()); |