Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify UsbDeviceManager.containsFunction()

Browse Source 
This version handles cases like containsFunction("ab,a,b", "a") properly.

Change-Id: Iac44b93807f29c442759e1943f483b5ed797bc71
This commit is contained in:
Robin Lee
2013-12-06 16:40:47 +00:00
parent c6499939fa
commit c49ceff7f3
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/java/com/android/server/usb/UsbDeviceManager.java
View File

@@ -53,6 +53,7 @@ import java.io.FileDescriptor;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
@@ -287,12 +288,7 @@ public class UsbDeviceManager {
}
private static boolean containsFunction(String functions, String function) {
int index = functions.indexOf(function);
if (index < 0) return false;
if (index > 0 && functions.charAt(index - 1) != ',') return false;
int charAfter = index + function.length();
if (charAfter < functions.length() && functions.charAt(charAfter) != ',') return false;
return true;
return Arrays.asList(functions.split(",")).contains(function);
}
private final class UsbHandler extends Handler {