From 7e6067e36cb311b31ef2c436287282270a6accbf Mon Sep 17 00:00:00 2001
From: Benoit Goby <benoit@android.com>
Date: Fri, 24 Jun 2011 17:54:19 -0700
Subject: [PATCH] Update usb_connected() to support new gadget driver

Change-Id: Iabe8be5bbfa7d2bf1d13280c8734ff75b62a152f
---
 ui.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ui.c b/ui.c
index 0744da4..1736319 100644
--- a/ui.c
+++ b/ui.c
@@ -592,17 +592,18 @@ void ui_show_text(int visible)
 
 // Return true if USB is connected.
 static int usb_connected() {
-    int fd = open("/sys/class/switch/usb_connected/state", O_RDONLY);
+    int fd = open("/sys/class/android_usb/android0/state", O_RDONLY);
     if (fd < 0) {
-        printf("failed to open /sys/class/switch/usb_connected/state: %s\n",
+        printf("failed to open /sys/class/android_usb/android0/state: %s\n",
                strerror(errno));
         return 0;
     }
 
     char buf;
-    int connected = (read(fd, &buf, 1) == 1) && (buf == '1');
+    /* USB is connected if android_usb state is CONNECTED or CONFIGURED */
+    int connected = (read(fd, &buf, 1) == 1) && (buf == 'C');
     if (close(fd) < 0) {
-        printf("failed to close /sys/class/switch/usb_connected/state: %s\n",
+        printf("failed to close /sys/class/android_usb/android0/state: %s\n",
                strerror(errno));
     }
     return connected;