From c92adae8a3a686b38426372a33b8eee8c6da35bf Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Fri, 4 Feb 2022 20:49:14 +0000
Subject: [PATCH] Fix formatting string in PolicyVersionUpgrade

The format string had an extra '%s' which was presumably for the
Exception string, but Slog.e already captures that.

Bug: 217923092
Test: errorprone build
Change-Id: I523bd94b65f00bc0332a2c3e3c8ed28de2df1974
---
 services/Android.bp                                             | 1 +
 .../com/android/server/devicepolicy/PolicyVersionUpgrader.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/Android.bp b/services/Android.bp
index 654e8d05d7138..b40034abb1728 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -20,6 +20,7 @@ java_defaults {
             "-Xep:NullTernary:ERROR",
             "-Xep:TryFailThrowable:ERROR",
             "-Xep:HashtableContains:ERROR",
+            "-Xep:FormatString:ERROR",
             // NOTE: only enable to generate local patchfiles
             // "-XepPatchChecks:refaster:frameworks/base/errorprone/refaster/EfficientXml.java.refaster",
             // "-XepPatchLocation:/tmp/refaster/",
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java
index 6bc7ba6499acc..f0ceb311cd8b8 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/PolicyVersionUpgrader.java
@@ -184,7 +184,7 @@ public class PolicyVersionUpgrader {
             Files.write(file.toPath(), versionBytes);
             versionFile.commit();
         } catch (IOException e) {
-            Slog.e(LOG_TAG, String.format("Writing version %d failed: %s", version), e);
+            Slog.e(LOG_TAG, String.format("Writing version %d failed", version), e);
             versionFile.rollback();
         }
     }