Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cccbb5f5 authored by Nandana Dutt's avatar Nandana Dutt
Browse files

Add a function to Dumpstate service to trigger a bugreport 

Add startBugreport() to Dumpstate interface. This is part of
proper binderization of Dumpstate.

The function is not implemented yet.

BUG: 111441001
Test: m -j dumpstate
Test: adb shell /data/nativetest64/dumpstate_test/dumpstate_test
Change-Id: I484215067e5653d2e2f4e34bd9a9b569d426f411
parent ea96f70b

cmds/dumpstate/Android.bp

+12 −1
Original line number Diff line number Diff line
@@ -57,10 +57,21 @@ cc_library_shared { 
        export_aidl_headers: true,

    },

    srcs: [

        "binder/android/os/IDumpstate.aidl",

        "binder/android/os/DumpstateOptions.cpp",

        ":dumpstate_aidl",

    ],

    export_include_dirs: ["binder"],

}



filegroup {

    name: "dumpstate_aidl",

    srcs: [

        "binder/android/os/IDumpstateListener.aidl",

        "binder/android/os/IDumpstateToken.aidl",

        //"binder/android/os/DumpstateOptions.aidl",

        "binder/android/os/IDumpstate.aidl",

    ],

    path: "binder",

}



cc_defaults {

cmds/dumpstate/DumpstateService.cpp

+7 −0
Original line number Diff line number Diff line
@@ -77,6 +77,13 @@ binder::Status DumpstateService::setListener(const std::string& name, 
    return binder::Status::ok();

}



binder::Status DumpstateService::startBugreport(int, const sp<IDumpstateListener>&,

                                                const DumpstateOptions&, int32_t* returned_id) {

    // TODO: fork to handle the bugreport request and return the process id or a request id here.

    *returned_id = -1;

    return binder::Status::ok();

}



status_t DumpstateService::dump(int fd, const Vector<String16>&) {

    dprintf(fd, "id: %d\n", ds_.id_);

    dprintf(fd, "pid: %d\n", ds_.pid_);

cmds/dumpstate/DumpstateService.h

+3 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ class DumpstateService : public BinderService<DumpstateService>, public BnDumpst 
                               bool getSectionDetails,

                               sp<IDumpstateToken>* returned_token) override;



    binder::Status startBugreport(int fd, const sp<IDumpstateListener>& listener,

                                  const DumpstateOptions& options, int32_t* returned_id) override;



  private:

    Dumpstate& ds_;

    std::mutex lock_;

cmds/dumpstate/binder/android/os/DumpstateOptions.aidl

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/**

 * 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";

cmds/dumpstate/binder/android/os/DumpstateOptions.cpp

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/**

 * 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