Snap for 4945494 from 4bb7aab6d191052e075e402229b3ad671febc028 to pi-qpr1-release

Change-Id: I0a7d4722dc3cd07c5a489dfde3334aff63f0af77

3 files changed, 21 insertions, 8 deletions

diff --git a/init.ranchu.rc b/init.ranchu.rc
index 12f5a68..bf77184 100644
--- a/init.ranchu.rc
+++ b/init.ranchu.rc
@@ -36,6 +36,8 @@ on boot
 
     start goldfish-logcat
 
+    # Create a dummy USB gadget to allow sysfs testing
+    mkdir /config/usb_gadget/g1 0770 root root
 
 service ranchu-setup /vendor/bin/init.ranchu-core.sh
     class core
diff --git a/ril/reference-ril.c b/ril/reference-ril.c
index c0db44d..51f63ea 100644
--- a/ril/reference-ril.c
+++ b/ril/reference-ril.c
@@ -2415,7 +2415,7 @@ static void requestGetSimAuthentication(void *data, size_t datalen __unused, RIL
     char* line = p_response->p_intermediates->line;
 
     parseAuthResponse(line, &auth_response);
-    RIL_onRequestComplete(t, RIL_E_SUCCESS, &auth_response, sizeof(auth_response));
+    RIL_onRequestComplete(t, auth_response.sw2, &auth_response, sizeof(auth_response));
     free(auth_response.simResponse);
     free(p_response);
 }
diff --git a/wifi/wpa_supplicant_8_lib/driver_cmd_nl80211.c b/wifi/wpa_supplicant_8_lib/driver_cmd_nl80211.c
index 7cf4468..9589e85 100644
--- a/wifi/wpa_supplicant_8_lib/driver_cmd_nl80211.c
+++ b/wifi/wpa_supplicant_8_lib/driver_cmd_nl80211.c
@@ -43,8 +43,6 @@ int wpa_driver_nl80211_driver_cmd(
     void* priv, char* cmd, char* buf, size_t buf_len) {
   struct i802_bss* bss = priv;
   struct wpa_driver_nl80211_data* drv = bss->drv;
-  struct ifreq ifr;
-  android_wifi_priv_cmd priv_cmd;
   int ret = 0;
 
   D("%s: called", __FUNCTION__);
@@ -70,27 +68,40 @@ int wpa_driver_nl80211_driver_cmd(
 }
 
 
-int wpa_driver_set_p2p_noa(void* priv, u8 count, int start, int duration) {
+int wpa_driver_set_p2p_noa(
+    __attribute__((__unused__)) void* priv,
+    __attribute__((__unused__)) u8 count,
+    __attribute__((__unused__)) int start,
+    __attribute__((__unused__)) int duration) {
   D("%s: called", __FUNCTION__);
   return 0;
 }
 
 
-int wpa_driver_get_p2p_noa(void* priv, u8* buf, size_t len) {
+int wpa_driver_get_p2p_noa(
+    __attribute__((__unused__)) void* priv,
+    __attribute__((__unused__)) u8* buf,
+    __attribute__((__unused__)) size_t len) {
   D("%s: called", __FUNCTION__);
   return 0;
 }
 
 
-int wpa_driver_set_p2p_ps(void* priv, int legacy_ps, int opp_ps, int ctwindow) {
+int wpa_driver_set_p2p_ps(
+    __attribute__((__unused__)) void* priv,
+    __attribute__((__unused__)) int legacy_ps,
+    __attribute__((__unused__)) int opp_ps,
+    __attribute__((__unused__)) int ctwindow) {
   D("%s: called", __FUNCTION__);
   return -1;
 }
 
 
 int wpa_driver_set_ap_wps_p2p_ie(
-    void* priv, const struct wpabuf* beacon,
-    const struct wpabuf* proberesp, const struct wpabuf* assocresp) {
+    __attribute__((__unused__)) void* priv,
+    __attribute__((__unused__)) const struct wpabuf* beacon,
+    __attribute__((__unused__)) const struct wpabuf* proberesp,
+    __attribute__((__unused__)) const struct wpabuf* assocresp) {
   D("%s: called", __FUNCTION__);
   return 0;
 }