commit 4a088921558b4e4bd4b27222e974fa72c76412cd
author Stephan Herhut <herhut@google.com> Wed May 24 12:10:32 2017 +0200
committer Stephan Herhut <herhut@google.com> Wed May 24 12:10:32 2017 +0200
tree d6331b76fbc42e939e60ea78c1a2fdac5b280cdb
parent 2d991004091b8fbc851561463bb537c84da2ed29

Make all private fields public.

Bug:
Change-Id: Ice94c73cbb63991d9773556c0597543eb227eb3f

src/main/java/com/android/tools/r8/graph/ClassAndMemberPublicizer.java

diff --git a/src/main/java/com/android/tools/r8/graph/ClassAndMemberPublicizer.java b/src/main/java/com/android/tools/r8/graph/ClassAndMemberPublicizer.java
index e2e972c..3c3c2b9 100644
--- a/src/main/java/com/android/tools/r8/graph/ClassAndMemberPublicizer.java
+++ b/src/main/java/com/android/tools/r8/graph/ClassAndMemberPublicizer.java
@@ -7,7 +7,7 @@
 
   private static void publicizeAllMethods(DexEncodedMethod[] methods) {
     for (DexEncodedMethod method : methods) {
-      method.accessFlags.promoteToPublic();
+      method.accessFlags.promoteNonPrivateToPublic();
     }
   }
 

src/main/java/com/android/tools/r8/graph/DexAccessFlags.java

diff --git a/src/main/java/com/android/tools/r8/graph/DexAccessFlags.java b/src/main/java/com/android/tools/r8/graph/DexAccessFlags.java
index f409c4a..a8f9526 100644
--- a/src/main/java/com/android/tools/r8/graph/DexAccessFlags.java
+++ b/src/main/java/com/android/tools/r8/graph/DexAccessFlags.java
@@ -263,13 +263,18 @@
     set(Constants.ACC_DECLARED_SYNCHRONIZED);
   }
 
-  public void promoteToPublic() {
+  public void promoteNonPrivateToPublic() {
     if (!isPrivate()) {
       flags &= ~Constants.ACC_PROTECTED;
       flags |= Constants.ACC_PUBLIC;
     }
   }
 
+  public void promoteToPublic() {
+    flags &= ~Constants.ACC_PROTECTED & ~Constants.ACC_PRIVATE;
+    flags |= Constants.ACC_PUBLIC;
+  }
+
   private boolean isSet(int flag) {
     return (flags & flag) != 0;
   }