UsbHelper: Add additional methods for device enumeration and monitoring

[sigrok-androidutils.git] / src / org / sigrok / androidutils / UsbSupplicant.java

diff --git a/src/org/sigrok/androidutils/UsbSupplicant.java b/src/org/sigrok/androidutils/UsbSupplicant.java
index 928cdef04f46bec6f596992dd0d6838dad4f30f2..0f219a87c932c2dbc7466762b1865c0dea00b3da 100644 (file)
--- a/src/org/sigrok/androidutils/UsbSupplicant.java
+++ b/src/org/sigrok/androidutils/UsbSupplicant.java
@@ -16,6 +16,21 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+/*
+ * Copyright (C) 2011 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 org.sigrok.androidutils;
 
@@ -38,7 +53,7 @@ import org.xmlpull.v1.XmlPullParserException;
 
 public class UsbSupplicant
 {
-       private static final String ACTION_USB_PERMISSION =
+       static final String ACTION_USB_PERMISSION =
        "org.sigrok.androidutils.USB_PERMISSION";
 
        protected final Context context;
@@ -202,7 +217,7 @@ public class UsbSupplicant
                }
        }
 
-       protected boolean interresting(UsbDevice dev)
+       protected boolean interesting(UsbDevice dev)
        {
                if (dev == null)
                        return false;
@@ -226,8 +241,8 @@ public class UsbSupplicant
                context.registerReceiver(hotplugReceiver, hotplugFilter);
                HashMap<String,UsbDevice> devlist = manager.getDeviceList();
                for (UsbDevice dev : devlist.values()) {
-                       if (interresting(dev) && !manager.hasPermission(dev)) {
-                               Log.d("UsbSupplicant", "found interresting device " + dev);
+                       if (interesting(dev) && !manager.hasPermission(dev)) {
+                               Log.d("UsbSupplicant", "found interesting device " + dev);
                                askFor(dev);
                        }
                }
@@ -247,7 +262,7 @@ public class UsbSupplicant
 
        protected void attachCallback(UsbDevice dev)
        {
-               if (interresting(dev) && !manager.hasPermission(dev))
+               if (interesting(dev) && !manager.hasPermission(dev))
                        askFor(dev);
        }