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

am 65d4f7a6: Merge changes Id0595c4b,Ia1a3e8c3 into mnc-dev

Browse Source 
* commit '65d4f7a6832e022fc1edb868f50c391d9cb72d99':
  Revert "Replace infinite loop with foreach."
  Update intellij project for tools-common sources.
This commit is contained in:
Deepanshu Gupta
2015-07-08 05:58:01 +00:00
committed by Android Git Automerger
parent d60723879f 65d4f7a683
commit 7e4414f23d
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/layoutlib/bridge/bridge.iml
View File

@@ -46,7 +46,7 @@
</CLASSES> </CLASSES>
<JAVADOC /> <JAVADOC />
<SOURCES> <SOURCES>
<root url="file://$ANDROID_SRC$/tools/base/common/src/main/java" /> <root url="jar://$MODULE_DIR$/../../../../../prebuilts/misc/common/tools-common/tools-common-prebuilt-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
</orderEntry> </orderEntry>

10
tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java
View File

@@ -94,8 +94,14 @@ public class AsmGenerator {
ListIterator<Class<?>> iter = injectedClasses.listIterator(); ListIterator<Class<?>> iter = injectedClasses.listIterator();
while (iter.hasNext()) { while (iter.hasNext()) {
Class<?> clazz = iter.next(); Class<?> clazz = iter.next();
for (Class<?> aClass : clazz.getDeclaredClasses()) { try {
iter.add(aClass); int i = 1;
while(i < 100) {
iter.add(Class.forName(clazz.getName() + "$" + i));
i++;
}
} catch (ClassNotFoundException ignored) {
// Expected.
} }
} }
mInjectClasses = injectedClasses.toArray(new Class<?>[0]); mInjectClasses = injectedClasses.toArray(new Class<?>[0]);