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

Commit 1be25b01 authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Override different method in FakeSettings. 

SettingsProxy switched to using Uri objects internally,
so FakeSettings needs to reflect this.

NO_TYPO_CHECK=spelling error inherited from framework.

Fix: 166690211
Test: atest SystemUITests
Change-Id: Ie19ff39ba833eb63a79c7ec7a043f85e1e0bdfcb

Change-Id: Iceab113c8d5baf3292b6758dd988043a0e84cee1
parent e0f4a9bb

packages/SystemUI/tests/src/com/android/systemui/util/settings/FakeSettings.java

+5 −5
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ public class FakeSettings implements SecureSettings, GlobalSettings, SystemSetti 
    }



    @Override

    public void registerContentObserverForUser(String name, ContentObserver settingsObserver,

            int userHandle) {

        SettingsKey key = new SettingsKey(userHandle, name);

    public void registerContentObserverForUser(Uri uri, boolean notifyDescendents,

            ContentObserver settingsObserver, int userHandle) {

        SettingsKey key = new SettingsKey(userHandle, uri.toString());

        mContentObservers.putIfAbsent(key, new ArrayList<>());

        List<ContentObserver> observers = mContentObservers.get(key);

        observers.add(settingsObserver);
@@ -86,7 +86,7 @@ public class FakeSettings implements SecureSettings, GlobalSettings, SystemSetti 


    @Override

    public String getStringForUser(String name, int userHandle) {

        return mValues.get(new SettingsKey(userHandle, name));

        return mValues.get(new SettingsKey(userHandle, getUriFor(name).toString()));

    }



    @Override
@@ -107,7 +107,7 @@ public class FakeSettings implements SecureSettings, GlobalSettings, SystemSetti 
    @Override

    public boolean putStringForUser(String name, String value, String tag, boolean makeDefault,

            int userHandle, boolean overrideableByRestore) {

        SettingsKey key = new SettingsKey(userHandle, name);

        SettingsKey key = new SettingsKey(userHandle, getUriFor(name).toString());

        mValues.put(key, value);



        Uri uri = getUriFor(name);