From 11010c209a3cf240d2a0b3605f6bcfcd5d25e1cb Mon Sep 17 00:00:00 2001
From: Matt Pape <mpape@google.com>
Date: Mon, 6 May 2019 12:27:55 -0700
Subject: [PATCH] Update PackageWatchdog to use the properties listener for
 DeviceConfig.

Remove references to the OnPropertyChangedListener which is being removed.

Test: atest PackageWatchdogTest
Bug: 128902955
Change-Id: I0c3250be2ba340113aaf6265eb38c37ac75a8d7b
---
 .../core/java/com/android/server/PackageWatchdog.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 7b5b419a7aa01..086088bdcfb8d 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -685,13 +685,13 @@ public class PackageWatchdog {
         }
     }
 
-    /** Adds a {@link DeviceConfig#OnPropertyChangedListener}. */
+    /** Adds a {@link DeviceConfig#OnPropertiesChangedListener}. */
     private void setPropertyChangedListenerLocked() {
-        DeviceConfig.addOnPropertyChangedListener(
+        DeviceConfig.addOnPropertiesChangedListener(
                 DeviceConfig.NAMESPACE_ROLLBACK,
                 mContext.getMainExecutor(),
-                (namespace, name, value) -> {
-                    if (!DeviceConfig.NAMESPACE_ROLLBACK.equals(namespace)) {
+                (properties) -> {
+                    if (!DeviceConfig.NAMESPACE_ROLLBACK.equals(properties.getNamespace())) {
                         return;
                     }
                     updateConfigs();