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

Commit f14ed648 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Refaster templates for new TypedXml classes. 

Since we have over 100 unique schemas across the OS, it would be
incredibly tedious to try migrating all that logic to use the more
efficient TypedXmlSerializer and TypedXmlPullParser interfaces.

To aid this migration process, this change adds Refaster templates
that offer to refactor matching existing code in a no-op fashion.

This change also upgrades Error Prone to the latest release.

Bug: 171832118
Test: manual
Change-Id: Ic93a46d646edee98af7d0e2f7891d931fca4825f
parent 9242fb8b

Android.bp

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ java_defaults { 
            "-Xep:AndroidFrameworkBinderIdentity:ERROR",

            "-Xep:AndroidFrameworkCompatChange:ERROR",

            "-Xep:AndroidFrameworkUid:ERROR",

            // NOTE: only enable to generate local patchfiles

            // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",

            // "-XepPatchLocation:/tmp/refaster/",

        ],

    },

}
@@ -913,8 +916,9 @@ java_library_host { 
        include_dirs: ["external/protobuf/src"],

        type: "full",

    },

    // Protos have lots of MissingOverride and similar.

    errorprone: {

        javacflags: ["-Xep:MissingOverride:OFF"], // b/72714520

        javacflags: ["-XepDisableAllChecks"],

    },

}

errorprone/java/com/google/errorprone/bugpatterns/android/CompatChangeChecker.java

+2 −2
Original line number Diff line number Diff line
@@ -18,13 +18,13 @@ package com.google.errorprone.bugpatterns.android; 


import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;

import static com.google.errorprone.bugpatterns.android.TargetSdkChecker.binaryTreeExact;

import static com.google.errorprone.matchers.FieldMatchers.anyFieldInClass;

import static com.google.errorprone.matchers.FieldMatchers.staticField;

import static com.google.errorprone.matchers.Matchers.allOf;

import static com.google.errorprone.matchers.Matchers.anyOf;

import static com.google.errorprone.matchers.Matchers.anything;

import static com.google.errorprone.matchers.Matchers.kindIs;

import static com.google.errorprone.matchers.Matchers.not;

import static com.google.errorprone.matchers.android.FieldMatchers.anyFieldInClass;

import static com.google.errorprone.matchers.android.FieldMatchers.staticField;



import com.google.auto.service.AutoService;

import com.google.errorprone.BugPattern;

errorprone/java/com/google/errorprone/bugpatterns/android/PendingIntentMutabilityChecker.java

+1 −2
Original line number Diff line number Diff line
@@ -17,12 +17,11 @@ 
package com.google.errorprone.bugpatterns.android;



import static com.google.errorprone.BugPattern.SeverityLevel.WARNING;

import static com.google.errorprone.matchers.FieldMatchers.staticField;

import static com.google.errorprone.matchers.Matchers.anyOf;

import static com.google.errorprone.matchers.Matchers.contains;

import static com.google.errorprone.matchers.Matchers.methodInvocation;

import static com.google.errorprone.matchers.Matchers.staticMethod;



import static com.google.errorprone.matchers.android.FieldMatchers.staticField;



import com.google.auto.service.AutoService;

import com.google.errorprone.BugPattern;

errorprone/java/com/google/errorprone/bugpatterns/android/TargetSdkChecker.java

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ import com.google.errorprone.VisitorState; 
import com.google.errorprone.bugpatterns.BugChecker;

import com.google.errorprone.bugpatterns.BugChecker.BinaryTreeMatcher;

import com.google.errorprone.matchers.Description;

import com.google.errorprone.matchers.FieldMatchers;

import com.google.errorprone.matchers.Matcher;

import com.google.errorprone.matchers.android.FieldMatchers;

import com.sun.source.tree.BinaryTree;

import com.sun.source.tree.ExpressionTree;

import com.sun.source.tree.Tree.Kind;

errorprone/java/com/google/errorprone/matchers/FieldMatchers.java→errorprone/java/com/google/errorprone/matchers/android/FieldMatchers.java

+2 −1
Original line number Diff line number Diff line
@@ -14,9 +14,10 @@ 
 * limitations under the License.

 */



package com.google.errorprone.matchers;

package com.google.errorprone.matchers.android;



import com.google.errorprone.VisitorState;

import com.google.errorprone.matchers.Matcher;

import com.google.errorprone.util.ASTHelpers;

import com.sun.source.tree.ExpressionTree;

import com.sun.source.tree.ImportTree;