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

Merge "[Settings] User with restriction should avoid from having entries through Settings search" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-31 00:20:15 +00:00
committed by Android (Google) Code Review
parent 5bde972e4e 55f1970181
commit 0362083f3a
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/datausage/BillingCycleSettings.java
View File

@@ -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);
}
};