Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Read communal setting from system user space.

Browse Source 
Communal settings are now stored under USER_SYSTEM, since they are shared across all users.

Test: atest CommunalSourceMonitorTest
Bug: 196967406
Change-Id: Ie546e5d099b72b89e3c41e71115a3edb0577f060
This commit is contained in:
Lucas Silva
2021-08-20 16:20:17 +00:00
parent f8c928be0e
commit db0fa489e6
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/communal/CommunalSourceMonitor.java
View File

@@ -75,7 +75,7 @@ public class CommunalSourceMonitor {
mSecureSettings.registerContentObserverForUser(
Settings.Secure.COMMUNAL_MODE_ENABLED,
/* notifyForDescendants= */false,
settingsObserver, UserHandle.USER_ALL);
settingsObserver, UserHandle.USER_SYSTEM);
reloadSettings();
}
@@ -141,8 +141,10 @@ public class CommunalSourceMonitor {
}
private void reloadSettings() {
boolean newCommunalEnabled = mSecureSettings.getInt(Settings.Secure.COMMUNAL_MODE_ENABLED,
1) == 1;
boolean newCommunalEnabled = mSecureSettings.getIntForUser(
Settings.Secure.COMMUNAL_MODE_ENABLED,
1,
UserHandle.USER_SYSTEM) == 1;
if (DEBUG) {
Log.d(TAG, "communal mode settings reloaded with value:" + newCommunalEnabled);

6
packages/SystemUI/tests/src/com/android/systemui/communal/CommunalSourceMonitorTest.java
View File

@@ -25,6 +25,7 @@ import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import android.os.Handler;
import android.os.UserHandle;
import android.provider.Settings;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
@@ -137,7 +138,10 @@ public class CommunalSourceMonitorTest extends SysuiTestCase {
}
private void setCommunalEnabled(boolean enabled) {
mSecureSettings.putInt(Settings.Secure.COMMUNAL_MODE_ENABLED, enabled ? 1 : 0);
mSecureSettings.putIntForUser(
Settings.Secure.COMMUNAL_MODE_ENABLED,
enabled ? 1 : 0,
UserHandle.USER_SYSTEM);
TestableLooper.get(this).processAllMessages();
}