commit 3a80d7f0038cc9d749f28e465e3f01a36425b8ff
author Matt Pape <mpape@google.com> Wed May 08 17:32:40 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 08 17:32:40 2019 +0000
tree 2e7a6dbe99fefa918ee7623e18c00492e152a39a
parent 6588949b2c55a56fd746817a10a7b6d46e40b77c
parent 11010c209a3cf240d2a0b3605f6bcfcd5d25e1cb

Merge "Update PackageWatchdog to use the properties listener for DeviceConfig." into qt-dev

services/core/java/com/android/server/PackageWatchdog.java

diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 103a0c7..3267114 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -684,13 +684,13 @@
         }
     }
 
-    /** 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();