commit be37f7b7a5b44e56d85fd30ab6dfcc590c8e4557
author Pavel Maltsev <pavelm@google.com> Tue Nov 27 22:58:19 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 27 22:58:19 2018 +0000
tree 1058f3208611249c774024783baf449a8ffd3a1c
parent 99a78f3ced1169de64a7366e3b8fe9d84ab16f07
parent 2e33ff5809caba027ee1aa53f0ea13054dceaf9a

Merge "Allow multiple device entries in usb-car-handler"

car-usb-handler/src/android/car/usb/handler/UsbSettingsStorage.java

diff --git a/car-usb-handler/src/android/car/usb/handler/UsbSettingsStorage.java b/car-usb-handler/src/android/car/usb/handler/UsbSettingsStorage.java
index 1b251f8..7e8704e 100644
--- a/car-usb-handler/src/android/car/usb/handler/UsbSettingsStorage.java
+++ b/car-usb-handler/src/android/car/usb/handler/UsbSettingsStorage.java
@@ -24,6 +24,7 @@
 import android.database.sqlite.SQLiteOpenHelper;
 import android.hardware.usb.UsbDevice;
 import android.util.Log;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -51,25 +52,23 @@
     private Cursor queryFor(SQLiteDatabase db, UsbDevice device) {
         String serial = device.getSerialNumber();
         String selection;
-        String[] selectionArgs;
+        List<String> selectionArgs = new ArrayList<>();
         if (AoapInterface.isDeviceInAoapMode(device)) {
             selection = COLUMN_SERIAL + " = ? AND " + COLUMN_AOAP + " = 1";
-            selectionArgs = new String[] {serial};
+            selectionArgs.add(serial);
         } else if (serial == null) {
-            selection = COLUMN_SERIAL + " IS NULL AND "
-                    + COLUMN_VID + " = ? AND " + COLUMN_PID + " = ?";
-            selectionArgs = new String[] {
-                    Integer.toString(device.getVendorId()),
-                    Integer.toString(device.getProductId())};
+            selection = COLUMN_SERIAL + " IS NULL";
         } else {
-            selection =
-                    COLUMN_SERIAL + " = ? AND " + COLUMN_VID + " = ? AND " + COLUMN_PID + " = ?";
-            selectionArgs = new String[] {
-                    device.getSerialNumber(),
-                    Integer.toString(device.getVendorId()),
-                    Integer.toString(device.getProductId())};
+            selection = COLUMN_SERIAL + " = ?";
+            selectionArgs.add(serial);
         }
-        return db.query(TABLE_USB_SETTINGS, null, selection, selectionArgs, null, null, null);
+
+        selection += " AND " + COLUMN_VID + " = ? AND " + COLUMN_PID + " = ?";
+        selectionArgs.add(String.valueOf(device.getVendorId()));
+        selectionArgs.add(String.valueOf(device.getProductId()));
+
+        return db.query(TABLE_USB_SETTINGS, null, selection,
+                selectionArgs.toArray(new String[0]), null, null, null);
     }
 
     /**