diff --git a/Android.bp b/Android.bp
index 06f3666..ae717f1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -601,6 +601,7 @@
     ],
     errorprone: {
         javacflags: [
+            "-Xep:AndroidFrameworkBinderIdentity:ERROR",
             "-Xep:AndroidFrameworkCompatChange:ERROR",
             "-Xep:AndroidFrameworkUid:ERROR",
         ],
diff --git a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java
index a009d57..9448344 100644
--- a/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java
+++ b/errorprone/tests/java/com/google/errorprone/bugpatterns/android/BinderIdentityCheckerTest.java
@@ -89,7 +89,7 @@
                         "  }",
                         "  void noFinal() {",
                         "    // BUG: Diagnostic contains:",
-                        "    final long token = Binder.clearCallingIdentity();",
+                        "    long token = Binder.clearCallingIdentity();",
                         "    try {",
                         "      FooService.class.toString();",
                         "    } finally {",
diff --git a/services/Android.bp b/services/Android.bp
index 25a0d7e..a689236 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -5,6 +5,7 @@
     ],
     errorprone: {
         javacflags: [
+            "-Xep:AndroidFrameworkBinderIdentity:ERROR",
             "-Xep:AndroidFrameworkCompatChange:ERROR",
             "-Xep:AndroidFrameworkUid:ERROR",
         ],