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

Commit 9e4f2bfd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Fix instances of ContentObserver#onChange in SystemUI" into rvc-dev am: bea69abe 

Change-Id: Ie31a11714febd0334e96cc22159b384f42cb9f6b
parents 066ad59e bea69abe

packages/CarSystemUI/src/com/android/systemui/car/CarDeviceProvisionedControllerImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -44,8 +44,9 @@ public class CarDeviceProvisionedControllerImpl extends DeviceProvisionedControl 
            CarSettings.Secure.KEY_SETUP_WIZARD_IN_PROGRESS);

    private final ContentObserver mCarSettingsObserver = new ContentObserver(

            Dependency.get(Dependency.MAIN_HANDLER)) {



        @Override

        public void onChange(boolean selfChange, Uri uri, int userId) {

        public void onChange(boolean selfChange, Uri uri, int flags) {

            if (USER_SETUP_IN_PROGRESS_URI.equals(uri)) {

                notifyUserSetupInProgressChanged();

            }

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsControllerImpl.kt

+7 −2
Original line number Diff line number Diff line
@@ -125,7 +125,12 @@ class ControlsControllerImpl @Inject constructor ( 


    @VisibleForTesting

    internal val settingObserver = object : ContentObserver(null) {

        override fun onChange(selfChange: Boolean, uri: Uri, userId: Int) {

        override fun onChange(

            selfChange: Boolean,

            uris: MutableIterable<Uri>,

            flags: Int,

            userId: Int

        ) {

            // Do not listen to changes in the middle of user change, those will be read by the

            // user-switch receiver.

            if (userChanging || userId != currentUserId) {

packages/SystemUI/src/com/android/systemui/doze/DozeSensors.java

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ public class DozeSensors { 


    private final ContentObserver mSettingsObserver = new ContentObserver(mHandler) {

        @Override

        public void onChange(boolean selfChange, Uri uri, int userId) {

        public void onChange(boolean selfChange, Iterable<Uri> uris, int flags, int userId) {

            if (userId != ActivityManager.getCurrentUser()) {

                return;

            }

packages/SystemUI/src/com/android/systemui/statusbar/notification/people/PeopleHubViewController.kt

+2 −2
Original line number Diff line number Diff line
@@ -164,8 +164,8 @@ class PeopleHubSettingChangeDataSourceImpl @Inject constructor( 
        // Immediately report current value of setting

        updateListener(listener)

        val observer = object : ContentObserver(handler) {

            override fun onChange(selfChange: Boolean, uri: Uri?, userId: Int) {

                super.onChange(selfChange, uri, userId)

            override fun onChange(selfChange: Boolean, uri: Uri?, flags: Int) {

                super.onChange(selfChange, uri, flags)

                updateListener(listener)

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/policy/DeviceProvisionedControllerImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class DeviceProvisionedControllerImpl extends CurrentUserTracker implemen 
        mUserSetupUri = Secure.getUriFor(Secure.USER_SETUP_COMPLETE);

        mSettingsObserver = new ContentObserver(mainHandler) {

            @Override

            public void onChange(boolean selfChange, Uri uri, int userId) {

            public void onChange(boolean selfChange, Uri uri, int flags) {

                Log.d(TAG, "Setting change: " + uri);

                if (mUserSetupUri.equals(uri)) {

                    notifySetupChanged();