Merge "Guard CellularSecurityPreferenceController with FEATURE_TELEPHONY" into main

This commit is contained in:
Yomna Nasser
2024-03-22 13:41:59 +00:00
committed by Android (Google) Code Review

View File

@@ -19,6 +19,7 @@ package com.android.settings.network;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.safetycenter.SafetyCenterManager; import android.safetycenter.SafetyCenterManager;
@@ -65,7 +66,8 @@ public class CellularSecurityPreferenceController extends BasePreferenceControll
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
if (!Flags.enableIdentifierDisclosureTransparencyUnsolEvents() if (!mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
|| !Flags.enableIdentifierDisclosureTransparencyUnsolEvents()
|| !Flags.enableModemCipherTransparencyUnsolEvents() || !Flags.enableModemCipherTransparencyUnsolEvents()
|| !Flags.enableIdentifierDisclosureTransparency() || !Flags.enableIdentifierDisclosureTransparency()
|| !Flags.enableModemCipherTransparency()) { || !Flags.enableModemCipherTransparency()) {