From 757da37e0bdfc5e097a64ec190a1dfdaf1c2665d Mon Sep 17 00:00:00 2001
From: JW Wang <wangchun@google.com>
Date: Fri, 29 Jan 2021 17:51:41 +0800
Subject: [PATCH] updateConfigs() might throw during tests (3/n)

The callback might be run in-between setUp() and tearDown() when
the permission READ_DEVICE_CONFIG has been dropped and crash tests.

Bug: 178675924
Test: atest PackageWatchdogTest
Change-Id: Iefd31d08f71340706b64d84d44c41151b21193bf
---
 services/core/java/com/android/server/PackageWatchdog.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 8b506bac4a851..919d3d02ba78e 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -982,7 +982,11 @@ public class PackageWatchdog {
                     if (!DeviceConfig.NAMESPACE_ROLLBACK.equals(properties.getNamespace())) {
                         return;
                     }
-                    updateConfigs();
+                    try {
+                        updateConfigs();
+                    } catch (Exception ignore) {
+                        Slog.w(TAG, "Failed to reload device config changes");
+                    }
                 });
     }