Merge "Only notify listeners if device Id changed"

2023-01-12 17:59:09 +00:00
parent 9ddd3e434b e45ccc9216
commit f3506e6c51
1 changed files with 5 additions and 2 deletions
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -3048,8 +3048,11 @@ class ContextImpl extends Context {
            throw new UnsupportedOperationException(
                    "Cannot update device ID on a Context created with createDeviceContext()");
        }
-        mDeviceId = updatedDeviceId;
-        notifyOnDeviceChangedListeners(updatedDeviceId);
+
+        if (mDeviceId != updatedDeviceId) {
+            mDeviceId = updatedDeviceId;
+            notifyOnDeviceChangedListeners(updatedDeviceId);
+        }
    }

    @Override