From 20c384d176f086f45f919923adb11108312eb3f1 Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Wed, 2 Nov 2022 10:41:59 +0800
Subject: [PATCH] Add an error message for debugging

Bug: 256205354
Test: atest CtsRollbackManagerTestCases
Change-Id: I4512ce63a586e94303679af0f565e9ccdff89177
---
 services/core/java/com/android/server/RescueParty.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/RescueParty.java b/services/core/java/com/android/server/RescueParty.java
index c1c9fbb121a80..b56d1fca7f6ac 100644
--- a/services/core/java/com/android/server/RescueParty.java
+++ b/services/core/java/com/android/server/RescueParty.java
@@ -231,7 +231,12 @@ public class RescueParty {
             String namespaceToReset = namespaceIt.next();
             Properties properties = new Properties.Builder(namespaceToReset).build();
             try {
-                DeviceConfig.setProperties(properties);
+                if (!DeviceConfig.setProperties(properties)) {
+                    logCriticalInfo(Log.ERROR, "Failed to clear properties under "
+                            + namespaceToReset
+                            + ". Running `device_config get_sync_disabled_for_tests` will confirm"
+                            + " if config-bulk-update is enabled.");
+                }
             } catch (DeviceConfig.BadConfigException exception) {
                 logCriticalInfo(Log.WARN, "namespace " + namespaceToReset
                         + " is already banned, skip reset.");