Revert "Upgrade from Progaurd 4.4 to 4.7."cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2cm-10.1-M1mr1.1-stagingjellybean-stablejellybeancm-10.1

This reverts commit cfead78069f3dc32998dc118ee08cab3867acea2.
Bug: 6079915

1 files changed, 2 insertions, 14 deletions

diff --git a/src/proguard/obfuscate/ClassObfuscator.java b/src/proguard/obfuscate/ClassObfuscator.java
index 446b158..9af0c82 100644
--- a/src/proguard/obfuscate/ClassObfuscator.java
+++ b/src/proguard/obfuscate/ClassObfuscator.java
@@ -2,7 +2,7 @@
  * ProGuard -- shrinking, optimization, obfuscation, and preverification
  *             of Java bytecode.
  *
- * Copyright (c) 2002-2011 Eric Lafortune (eric@graphics.cornell.edu)
+ * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu)
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -469,25 +469,13 @@ implements   ClassVisitor,
     {
         // Come up with class names until we get an original one.
         String newClassName;
-        String newMixedCaseClassName;
         do
         {
             // Let the factory produce a class name.
             newClassName = newPackagePrefix +
                            classNameFactory.nextName();
-
-            newMixedCaseClassName = mixedCaseClassName(newClassName);
-        }
-        while (classNamesToAvoid.contains(newMixedCaseClassName));
-
-        // Explicitly make sure the name isn't used again if we have a
-        // user-specified dictionary and we're not allowed to have mixed case
-        // class names -- just to protect against problematic dictionaries.
-        if (this.classNameFactory != null &&
-            !useMixedCaseClassNames)
-        {
-            classNamesToAvoid.add(newMixedCaseClassName);
         }
+        while (classNamesToAvoid.contains(mixedCaseClassName(newClassName)));
 
         return newClassName;
     }