commit c9422c7c50f750640a2226cfdb4194beb0f2e06c
author Roshan Pius <rpius@google.com> Mon Jul 11 10:18:22 2016 -0700
committer Roshan Pius <rpius@google.com> Mon Oct 24 09:23:13 2016 -0700
tree d0eab3131b292c88d5cdde063c3200e206aed983
parent 950bec9c63138f8ccfb0ed22c4cac30f1c124be3

binder: Set/Get debug params

Implement the |wpa_supplicant| debug params setter/getter methods.

BUG: 30065582
TEST: Ran the integration tests under |wificond|.

Change-Id: I632541da8c86bcd352d17ae8a71bcadbe3a68034
Signed-off-by: Roshan Pius <rpius@google.com>

wpa_supplicant/binder/supplicant.h

diff --git a/wpa_supplicant/binder/supplicant.h b/wpa_supplicant/binder/supplicant.h
index 5b5fafa..10db25c 100644
--- a/wpa_supplicant/binder/supplicant.h
+++ b/wpa_supplicant/binder/supplicant.h
@@ -35,16 +35,30 @@
 	Supplicant(struct wpa_global *global);
 	~Supplicant() override = default;
 
+	// Binder methods exposed in aidl.
 	android::binder::Status CreateInterface(
 	    const android::os::PersistableBundle &params,
-	    android::sp<fi::w1::wpa_supplicant::IIface> *aidl_return) override;
+	    android::sp<fi::w1::wpa_supplicant::IIface> *iface_object_out)
+	    override;
 	android::binder::Status
 	RemoveInterface(const std::string &ifname) override;
 	android::binder::Status GetInterface(
 	    const std::string &ifname,
-	    android::sp<fi::w1::wpa_supplicant::IIface> *aidl_return) override;
+	    android::sp<fi::w1::wpa_supplicant::IIface> *iface_object_out)
+	    override;
+	android::binder::Status
+	SetDebugParams(int level, bool show_timestamp, bool show_keys) override;
+	android::binder::Status GetDebugLevel(int *level_out) override;
+	android::binder::Status
+	GetDebugShowTimestamp(bool *show_timestamp_out) override;
+	android::binder::Status GetDebugShowKeys(bool *show_keys_out) override;
 
 private:
+	int convertDebugLevelToInternalLevel(
+	    int external_level, int *internal_level);
+	int convertDebugLevelToExternalLevel(
+	    int internal_level, int *external_level);
+
 	/* Raw pointer to the global structure maintained by the core. */
 	struct wpa_global *wpa_global_;
 	/* All the callback objects registered by the clients. */