diff options
author | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-29 17:19:43 -0700 |
---|---|---|
committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-09-29 17:19:43 -0700 |
commit | b64a23b7cc2761f03879ceb6b030ae80171f11e2 (patch) | |
tree | 86ba49fd1b7275a7e293c3c3bc44e6317bebf67f /src/proguard/optimize/info/NonPrivateMemberMarker.java | |
parent | fe926bab25e3af81265d4e0bbb79bcdb41b10635 (diff) | |
parent | 9961286c06c25cd03464d3e2b00bd9b9dedf96ba (diff) | |
download | android_external_proguard-stable/cm-11.0-XNG2S.tar.gz android_external_proguard-stable/cm-11.0-XNG2S.tar.bz2 android_external_proguard-stable/cm-11.0-XNG2S.zip |
Merge remote-tracking branch 'aosp/l-preview' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
Diffstat (limited to 'src/proguard/optimize/info/NonPrivateMemberMarker.java')
-rw-r--r-- | src/proguard/optimize/info/NonPrivateMemberMarker.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/proguard/optimize/info/NonPrivateMemberMarker.java b/src/proguard/optimize/info/NonPrivateMemberMarker.java index d451643..06f8500 100644 --- a/src/proguard/optimize/info/NonPrivateMemberMarker.java +++ b/src/proguard/optimize/info/NonPrivateMemberMarker.java @@ -2,7 +2,7 @@ * ProGuard -- shrinking, optimization, obfuscation, and preverification * of Java bytecode. * - * Copyright (c) 2002-2009 Eric Lafortune (eric@graphics.cornell.edu) + * Copyright (c) 2002-2013 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 @@ -77,15 +77,9 @@ implements ClassVisitor, public void visitStringConstant(Clazz clazz, StringConstant stringConstant) { - Clazz referencedClass = stringConstant.referencedClass; - - // Is it refering to another class or class member? - if (referencedClass != null && - !referencedClass.equals(clazz)) - { - // The referenced class member, if any, can never be made private. - stringConstant.referencedMemberAccept(this); - } + // The referenced class member, if any, can never be made private, + // even if it's in the same class. + stringConstant.referencedMemberAccept(this); } @@ -93,7 +87,7 @@ implements ClassVisitor, { Clazz referencedClass = refConstant.referencedClass; - // Is it refering to a class member in another class? + // Is it referring to a class member in another class? // The class member might be in another class, or // it may be referenced through another class. if (referencedClass != null && |