Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e4414f2 authored by Deepanshu Gupta's avatar Deepanshu Gupta Committed by Android Git Automerger
Browse files

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

* commit '65d4f7a6':
  Revert "Replace infinite loop with foreach."
  Update intellij project for tools-common sources.
parents d6072387 65d4f7a6

tools/layoutlib/bridge/bridge.iml

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
        </CLASSES>

        <JAVADOC />

        <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>

      </library>

    </orderEntry>

tools/layoutlib/create/src/com/android/tools/layoutlib/create/AsmGenerator.java

+8 −2
Original line number Diff line number Diff line
@@ -94,8 +94,14 @@ public class AsmGenerator { 
        ListIterator<Class<?>> iter = injectedClasses.listIterator();

        while (iter.hasNext()) {

            Class<?> clazz = iter.next();

            for (Class<?> aClass : clazz.getDeclaredClasses()) {

                iter.add(aClass);

            try {

                int i = 1;

                while(i < 100) {

                    iter.add(Class.forName(clazz.getName() + "$" + i));

                    i++;

                }

            } catch (ClassNotFoundException ignored) {

                // Expected.

            }

        }

        mInjectClasses = injectedClasses.toArray(new Class<?>[0]);