[Settings] User with restriction should avoid from having entries
through Settings search
1. Avoid from generating search report when user been restricted.
2. Guest user should have this restriction but not available, add
additional rule as a conpensation from UI's perspective.
Bug: 260860114
Bug: 235822222
Test: local
Change-Id: I63ba7f3b10fc812dd1498f17826a15e822879613
(cherry picked from commit 5e1c4d15a9)
Merged-In: I63ba7f3b10fc812dd1498f17826a15e822879613
This commit is contained in:
@@ -43,6 +43,7 @@ import androidx.preference.SwitchPreference;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
|
||||
import com.android.settings.network.SubscriptionUtil;
|
||||
import com.android.settings.network.telephony.MobileNetworkUtils;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settingslib.NetworkPolicyEditor;
|
||||
import com.android.settingslib.net.DataUsageController;
|
||||
@@ -503,7 +504,8 @@ public class BillingCycleSettings extends DataUsageBaseFragment implements
|
||||
|
||||
@Override
|
||||
protected boolean isPageSearchEnabled(Context context) {
|
||||
return SubscriptionUtil.isSimHardwareVisible(context)
|
||||
return (!MobileNetworkUtils.isMobileNetworkUserRestricted(context))
|
||||
&& SubscriptionUtil.isSimHardwareVisible(context)
|
||||
&& DataUsageUtils.hasMobileData(context);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user