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

Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev

Browse Source
This commit is contained in:
Deepanshu Gupta
2014-10-02 03:25:42 +00:00
committed by Android (Google) Code Review
parent bae6442159 2f3715aaaa
commit ffa4115a0e
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java
View File

@@ -116,17 +116,16 @@ public class Main {
} }
File[] possibleSdks = sdkDir.listFiles(new FileFilter() { File[] possibleSdks = sdkDir.listFiles(new FileFilter() {
@Override @Override
public boolean accept(File pathname) { public boolean accept(File path) {
return pathname.isDirectory() && pathname.getAbsolutePath().contains("android-sdk"); return path.isDirectory() && path.getAbsolutePath().contains("android-sdk");
} }
}); });
for (File possibleSdk : possibleSdks) { for (File possibleSdk : possibleSdks) {
File platformsDir = new File(possibleSdk, "platforms"); File platformsDir = new File(possibleSdk, "platforms");
File[] platforms = platformsDir.listFiles(new FileFilter() { File[] platforms = platformsDir.listFiles(new FileFilter() {
@Override @Override
public boolean accept(File pathname) { public boolean accept(File path) {
return pathname.isDirectory() return path.isDirectory() && path.getName().startsWith("android-");
&& pathname.toPath().getFileName().toString().startsWith("android-");
} }
}); });
if (platforms == null || platforms.length == 0) { if (platforms == null || platforms.length == 0) {
@@ -137,10 +136,8 @@ public class Main {
@Override @Override
public int compare(File o1, File o2) { public int compare(File o1, File o2) {
final int MAX_VALUE = 1000; final int MAX_VALUE = 1000;
String suffix1 = o1.toPath().getFileName().toString() String suffix1 = o1.getName().substring("android-".length());
.substring("android-".length()); String suffix2 = o2.getName().substring("android-".length());
String suffix2 = o2.toPath().getFileName().toString()
.substring("android-".length());
int suff1, suff2; int suff1, suff2;
try { try {
suff1 = Integer.parseInt(suffix1); suff1 = Integer.parseInt(suffix1);