Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27e54131 authored by Phil Weaver's avatar Phil Weaver Committed by android-build-merger
Browse files

Merge "Fix a race in settings update." into nyc-dev 

am: df15e03e

* commit 'df15e03e':
  Fix a race in settings update.

Change-Id: I6b51cb006e3b729ae8e0bd1060b41eb0ca1bdd68
parents 5ca04056 df15e03e

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+2 −2
Original line number Diff line number Diff line
@@ -1948,6 +1948,8 @@ public class SettingsProvider extends ContentProvider { 
            final int userId = getUserIdFromKey(key);

            Uri uri = getNotificationUriFor(key, name);



            mGenerationRegistry.incrementGeneration(key);



            mHandler.obtainMessage(MyHandler.MSG_NOTIFY_URI_CHANGED,

                    userId, 0, uri).sendToTarget();
@@ -1959,8 +1961,6 @@ public class SettingsProvider extends ContentProvider { 
                        sSystemCloneToManagedSettings);

            }



            mGenerationRegistry.incrementGeneration(key);



            mHandler.obtainMessage(MyHandler.MSG_NOTIFY_DATA_CHANGED).sendToTarget();

        }