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 am: 968dfc9c2e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22339270

Change-Id: I0d6344bd31759e32faaa98a274f7b5bf618494f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hieu Dang
2023-03-31 07:05:55 +00:00
committed by Automerger Merge Worker
parent 5b159df4f0 968dfc9c2e
commit 8689460fa4
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 mMassStorageActive;
private boolean mBluetoothEnableForTether; private boolean mBluetoothEnableForTether;
private boolean mUnavailable;
private DataSaverBackend mDataSaverBackend; private DataSaverBackend mDataSaverBackend;
private boolean mDataSaverEnabled; private boolean mDataSaverEnabled;
@@ -168,7 +167,6 @@ public class TetherSettings extends RestrictedSettingsFragment
setIfOnlyAvailableForAdmins(true); setIfOnlyAvailableForAdmins(true);
if (isUiRestricted()) { if (isUiRestricted()) {
mUnavailable = true;
getPreferenceScreen().removeAll(); getPreferenceScreen().removeAll();
return; return;
} }
@@ -360,7 +358,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (mUnavailable) { if (isUiRestricted()) {
if (!isUiRestrictedByOnlyAdmin()) { if (!isUiRestrictedByOnlyAdmin()) {
getEmptyTextView().setText(R.string.tethering_settings_not_available); getEmptyTextView().setText(R.string.tethering_settings_not_available);
} }
@@ -388,7 +386,7 @@ public class TetherSettings extends RestrictedSettingsFragment
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
if (mUnavailable) { if (isUiRestricted()) {
return; return;
} }
getActivity().unregisterReceiver(mTetherChangeReceiver); getActivity().unregisterReceiver(mTetherChangeReceiver);