diff options
Diffstat (limited to 'src')
3 files changed, 21 insertions, 18 deletions
diff --git a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java index be7704fd73..7c3d3b120e 100644 --- a/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java +++ b/src/com/android/settings/development/DefaultUsbConfigurationPreferenceController.java @@ -24,7 +24,7 @@ import android.os.UserHandle; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; -import com.android.settingslib.RestrictedSwitchPreference; +import com.android.settingslib.RestrictedPreference; import com.android.settingslib.development.DeveloperOptionsPreferenceController; public class DefaultUsbConfigurationPreferenceController extends @@ -32,7 +32,7 @@ public class DefaultUsbConfigurationPreferenceController extends private static final String PREFERENCE_KEY = "default_usb_configuration"; - private RestrictedSwitchPreference mPreference; + private RestrictedPreference mPreference; public DefaultUsbConfigurationPreferenceController(Context context) { super(context); diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java index 07d57140ec..ed6f9ed955 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -85,9 +85,12 @@ public class PrivateDnsPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { - return mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings) - ? AVAILABLE - : UNSUPPORTED_ON_DEVICE; + if (!mContext.getResources().getBoolean(R.bool.config_show_private_dns_settings)) { + return UNSUPPORTED_ON_DEVICE; + } + final UserManager userManager = mContext.getSystemService(UserManager.class); + if (userManager.isGuestUser()) return DISABLED_FOR_USER; + return AVAILABLE; } @Override diff --git a/src/com/android/settings/network/telephony/NetworkScanHelper.java b/src/com/android/settings/network/telephony/NetworkScanHelper.java index 081a4978ab..cd686db046 100644 --- a/src/com/android/settings/network/telephony/NetworkScanHelper.java +++ b/src/com/android/settings/network/telephony/NetworkScanHelper.java @@ -232,20 +232,20 @@ public class NetworkScanHelper { if (mNetworkScanRequester != null) { mNetworkScanRequester.stopScan(); mNetworkScanRequester = null; - } - - try { - int slotIndex = mTelephonyManager.getSlotIndex(); - if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) { - TelephonyUtils.abortIncrementalScan(mContext, slotIndex); - } else { - Log.d(TAG, "slotIndex is invalid, skipping abort"); + } else { + try { + int slotIndex = mTelephonyManager.getSlotIndex(); + if (slotIndex >= 0 && slotIndex < mTelephonyManager.getActiveModemCount()) { + TelephonyUtils.abortIncrementalScan(mContext, slotIndex); + } else { + Log.d(TAG, "slotIndex is invalid, skipping abort"); + } + mContext.unregisterReceiver(mLegacyIncrScanReceiver); + } catch (NullPointerException ex) { + Log.e(TAG, "abortIncrementalScan Exception: ", ex); + } catch (IllegalArgumentException ex) { + Log.e(TAG, "IllegalArgumentException"); } - mContext.unregisterReceiver(mLegacyIncrScanReceiver); - } catch (NullPointerException ex) { - Log.e(TAG, "abortIncrementalScan Exception: ", ex); - } catch (IllegalArgumentException ex) { - Log.e(TAG, "IllegalArgumentException"); } } |