Add removeCallback for System change callbacks

This CL is to fix the development options settings are not listening
to the system properties changes.  Also add removeChangeCallback
in SystemProperties to remove the callback when the view is destroyed
to avoid memory leak.

Test: Manual/Visual inspection
Bug: 127761520
Change-Id: I40178297fcd8b6a6d645f4b33660cdc95c529cef

1 files changed, 15 insertions, 0 deletions

diff --git a/core/java/android/os/SystemProperties.java b/core/java/android/os/SystemProperties.java
index edfdda8bb760..b69f5885c2e5 100644
--- a/core/java/android/os/SystemProperties.java
+++ b/core/java/android/os/SystemProperties.java
@@ -212,6 +212,21 @@ public class SystemProperties {
         }
     }
 
+    /**
+     * Remove the target callback.
+     *
+     * @param callback The {@link Runnable} that should be removed.
+     * @hide
+     */
+    @UnsupportedAppUsage
+    public static void removeChangeCallback(@NonNull Runnable callback) {
+        synchronized (sChangeCallbacks) {
+            if (sChangeCallbacks.contains(callback)) {
+                sChangeCallbacks.remove(callback);
+            }
+        }
+    }
+
     @SuppressWarnings("unused")  // Called from native code.
     private static void callChangeCallbacks() {
         synchronized (sChangeCallbacks) {