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

Merge "Check availability on start for TetherSettings" into udc-dev

Browse Source
This commit is contained in:
Hieu Dang
2023-03-31 06:30:53 +00:00
committed by Android (Google) Code Review
parent 9ff72e4205 12fc50ca3b
commit 968dfc9c2e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/network/tether/TetherSettings.java
View File

@@ -123,7 +123,6 @@ public class TetherSettings extends RestrictedSettingsFragment
private boolean mMassStorageActive;
private boolean mBluetoothEnableForTether;
private boolean mUnavailable;
private DataSaverBackend mDataSaverBackend;
private boolean mDataSaverEnabled;
@@ -168,7 +167,6 @@ public class TetherSettings extends RestrictedSettingsFragment
setIfOnlyAvailableForAdmins(true);
if (isUiRestricted()) {
mUnavailable = true;
getPreferenceScreen().removeAll();
return;
}
@@ -360,7 +358,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onStart() {
super.onStart();
if (mUnavailable) {
if (isUiRestricted()) {
if (!isUiRestrictedByOnlyAdmin()) {
getEmptyTextView().setText(R.string.tethering_settings_not_available);
}
@@ -388,7 +386,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onStop() {
super.onStop();
if (mUnavailable) {
if (isUiRestricted()) {
return;
}
getActivity().unregisterReceiver(mTetherChangeReceiver);