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

Commit d9c4b14b authored by Simon Ye's avatar Simon Ye Committed by Elliott Hughes
Browse files

Move host 'get-state' service up so that it works. 

Due to previous bad merge, the get-state service was moved out of the
ADB_HOST #ifdef block.

(cherry picked from commit dc22c3c7)

Change-Id: I08465e7c666104a4c2d15eadef8a4d4be7f91456
parent 3b1215c3

adb/adb.c

+5 −5
Original line number Diff line number Diff line
@@ -1670,11 +1670,6 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r 
        /* we don't even need to send a reply */

        return 0;

    }

#endif // ADB_HOST



    int ret = handle_forward_request(service, ttype, serial, reply_fd);

    if (ret >= 0)

      return ret - 1;



    if(!strncmp(service,"get-state",strlen("get-state"))) {

        transport = acquire_one_transport(CS_ANY, ttype, serial, NULL);
@@ -1682,6 +1677,11 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r 
        send_msg_with_okay(reply_fd, state, strlen(state));

        return 0;

    }

#endif // ADB_HOST



    int ret = handle_forward_request(service, ttype, serial, reply_fd);

    if (ret >= 0)

      return ret - 1;

    return -1;

}