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

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

@@ -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);