PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restrict screen saver settings searches to enabled users.

Browse Source 
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.

Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.

Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
This commit is contained in:
Will Leshner
2023-02-16 11:06:05 -08:00
parent 3a445a3ea1
commit ca1379f0b3
4 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/Utils.java
View File

@@ -1293,4 +1293,15 @@ public final class Utils extends com.android.settingslib.Utils {
return context.createContextAsUser(mainUser, 0).getSystemService(UserManager.class)
.isUserForeground();
}
/**
* Returns if dreams are available to the current user.
*/
public static boolean areDreamsAvailableToCurrentUser(Context context) {
final boolean dreamsSupported = context.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsSupported);
final boolean dreamsOnlyEnabledForDockUser = context.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
return dreamsSupported && (!dreamsOnlyEnabledForDockUser || canCurrentUserDream(context));
}
}

8
src/com/android/settings/display/ScreenSaverPreferenceController.java
View File

@@ -35,13 +35,7 @@ public class ScreenSaverPreferenceController extends BasePreferenceController im
@Override
public int getAvailabilityStatus() {
final boolean dreamsSupported = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsSupported);
final boolean dreamsOnlyEnabledForDockUser = mContext.getResources().getBoolean(
com.android.internal.R.bool.config_dreamsOnlyEnabledForDockUser);
return (dreamsSupported && (!dreamsOnlyEnabledForDockUser
|| Utils.canCurrentUserDream(mContext)))
? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return Utils.areDreamsAvailableToCurrentUser(mContext) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override

14
src/com/android/settings/dream/DreamSettings.java
View File

@@ -36,6 +36,7 @@ import androidx.preference.Preference;
import androidx.recyclerview.widget.RecyclerView;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -213,6 +214,17 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.dream_fragment_overview);
new SearchIndexProvider(R.xml.dream_fragment_overview);
static class SearchIndexProvider extends BaseSearchIndexProvider {
SearchIndexProvider(int xmlRes) {
super(xmlRes);
}
@Override
protected boolean isPageSearchEnabled(Context context) {
return Utils.areDreamsAvailableToCurrentUser(context);
}
}
}