commit 968dfc9c2e2751ce4841467f38596592f90c00d3
author Hieu Dang <thebestguy@google.com> Fri Mar 31 06:30:53 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 31 06:30:53 2023 +0000
tree a8b38461ac15791bf6e614488cfa9601ed965ab9
parent 9ff72e4205720bb9ee8f46e347d8655034b9a59e
parent 12fc50ca3bf53a39ef60d4974a66e9248b43bb60

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

src/com/android/settings/network/tether/TetherSettings.java

diff --git a/src/com/android/settings/network/tether/TetherSettings.java b/src/com/android/settings/network/tether/TetherSettings.java
index 68834fb..ba19d1c 100644
--- a/src/com/android/settings/network/tether/TetherSettings.java
+++ b/src/com/android/settings/network/tether/TetherSettings.java
@@ -123,7 +123,6 @@
     private boolean mMassStorageActive;
 
     private boolean mBluetoothEnableForTether;
-    private boolean mUnavailable;
 
     private DataSaverBackend mDataSaverBackend;
     private boolean mDataSaverEnabled;
@@ -168,7 +167,6 @@
 
         setIfOnlyAvailableForAdmins(true);
         if (isUiRestricted()) {
-            mUnavailable = true;
             getPreferenceScreen().removeAll();
             return;
         }
@@ -360,7 +358,7 @@
     public void onStart() {
         super.onStart();
 
-        if (mUnavailable) {
+        if (isUiRestricted()) {
             if (!isUiRestrictedByOnlyAdmin()) {
                 getEmptyTextView().setText(R.string.tethering_settings_not_available);
             }
@@ -388,7 +386,7 @@
     public void onStop() {
         super.onStop();
 
-        if (mUnavailable) {
+        if (isUiRestricted()) {
             return;
         }
         getActivity().unregisterReceiver(mTetherChangeReceiver);