diff options
| -rw-r--r-- | cmds/dumpstate/Android.bp | 2 | ||||
| -rw-r--r-- | cmds/dumpstate/binder/android/os/DumpstateOptions.aidl | 23 | ||||
| -rw-r--r-- | cmds/dumpstate/binder/android/os/DumpstateOptions.cpp | 46 | ||||
| -rw-r--r-- | cmds/dumpstate/binder/android/os/DumpstateOptions.h | 39 | ||||
| -rw-r--r-- | cmds/dumpstate/binder/android/os/IDumpstate.aidl | 1 |
5 files changed, 0 insertions, 111 deletions
diff --git a/cmds/dumpstate/Android.bp b/cmds/dumpstate/Android.bp index e938b1063f..28aeff4817 100644 --- a/cmds/dumpstate/Android.bp +++ b/cmds/dumpstate/Android.bp @@ -57,7 +57,6 @@ cc_library_shared { export_aidl_headers: true, }, srcs: [ - "binder/android/os/DumpstateOptions.cpp", ":dumpstate_aidl", ], export_include_dirs: ["binder"], @@ -68,7 +67,6 @@ filegroup { srcs: [ "binder/android/os/IDumpstateListener.aidl", "binder/android/os/IDumpstateToken.aidl", - //"binder/android/os/DumpstateOptions.aidl", "binder/android/os/IDumpstate.aidl", ], path: "binder", diff --git a/cmds/dumpstate/binder/android/os/DumpstateOptions.aidl b/cmds/dumpstate/binder/android/os/DumpstateOptions.aidl deleted file mode 100644 index c1a7f158cf..0000000000 --- a/cmds/dumpstate/binder/android/os/DumpstateOptions.aidl +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Copyright (c) 2018, 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. - */ - -package android.os; - -/** - * Specifies arguments for IDumpstate. - * {@hide} - */ -parcelable DumpstateOptions cpp_header "android/os/DumpstateOptions.h"; diff --git a/cmds/dumpstate/binder/android/os/DumpstateOptions.cpp b/cmds/dumpstate/binder/android/os/DumpstateOptions.cpp deleted file mode 100644 index 5654190bc4..0000000000 --- a/cmds/dumpstate/binder/android/os/DumpstateOptions.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * Copyright (c) 2018, 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 <android/os/DumpstateOptions.h> - -#include <binder/IBinder.h> -#include <binder/Parcel.h> - -namespace android { -namespace os { - -status_t DumpstateOptions::readFromParcel(const ::android::Parcel* parcel) { - if (status_t err = parcel->readBool(&get_section_details)) { - return err; - } - if (status_t err = parcel->readUtf8FromUtf16(&name)) { - return err; - } - return android::OK; -} - -status_t DumpstateOptions::writeToParcel(::android::Parcel* parcel) const { - if (status_t err = parcel->writeBool(get_section_details)) { - return err; - } - if (status_t err = parcel->writeUtf8AsUtf16(name)) { - return err; - } - return android::OK; -} - -} // namespace os -} // namespace android diff --git a/cmds/dumpstate/binder/android/os/DumpstateOptions.h b/cmds/dumpstate/binder/android/os/DumpstateOptions.h deleted file mode 100644 index a748e3c433..0000000000 --- a/cmds/dumpstate/binder/android/os/DumpstateOptions.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (c) 2018, 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. - */ - -#ifndef ANDROID_OS_DUMPSTATE_OPTIONS_H_ -#define ANDROID_OS_DUMPSTATE_OPTIONS_H_ - -#include <binder/Parcelable.h> - -namespace android { -namespace os { - -struct DumpstateOptions : public android::Parcelable { - // If true the caller can get callbacks with per-section progress details. - bool get_section_details = false; - - // Name of the caller. - std::string name; - - status_t writeToParcel(android::Parcel* parcel) const override; - status_t readFromParcel(const android::Parcel* parcel) override; -}; - -} // namespace os -} // namespace android - -#endif // ANDROID_OS_DUMPSTATE_OPTIONS_H_ diff --git a/cmds/dumpstate/binder/android/os/IDumpstate.aidl b/cmds/dumpstate/binder/android/os/IDumpstate.aidl index f58535eed0..b1005d3885 100644 --- a/cmds/dumpstate/binder/android/os/IDumpstate.aidl +++ b/cmds/dumpstate/binder/android/os/IDumpstate.aidl @@ -18,7 +18,6 @@ package android.os; import android.os.IDumpstateListener; import android.os.IDumpstateToken; -import android.os.DumpstateOptions; /** * Binder interface for the currently running dumpstate process. |