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

Remove temp workaround for feature flag

Browse Source 
Using the trunk stable feature flagging now.

Bug: 295516544
Test: m
Test: manual adb
Test: atest SafetySourceBroadcastReceiverTest
Test: atest PrivateSpaceSafetySourceTest
Change-Id: I3d2d8c11dfb224ad2b09572493633366b4c4805c
This commit is contained in:
Manish Singh
2023-09-12 16:52:28 +01:00
parent 7f028b684c
commit 5aef6b6264
5 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/privatespace/PrivateSpaceDashboardFragment.java
View File

@@ -18,7 +18,7 @@ package com.android.settings.privatespace;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.FeatureFlagUtils;
import android.os.Flags;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
@@ -56,13 +56,8 @@ public class PrivateSpaceDashboardFragment extends DashboardFragment {
new BaseSearchIndexProvider(R.xml.private_space_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
// Temporary workaround for hiding PS Settings until the trunk stable feature
// flag is available.
// TODO(b/295516544): Remove this workaround when trunk stable feature flag is
// available.
return SafetyCenterManagerWrapper.get().isEnabled(context)
&& FeatureFlagUtils.isEnabled(context,
FeatureFlagUtils.SETTINGS_PRIVATE_SPACE_SETTINGS);
&& Flags.allowPrivateProfile();
}
@Override