commit 3b53b807154a0bd3d1dccb44ad733838daf74ad0
author Zhen Zhang <zzhen@google.com> Mon Mar 23 12:18:14 2020 -0700
committer Zhen Zhang <zzhen@google.com> Tue Mar 24 06:58:41 2020 +0000
tree d74ef1576febe8ce4cfdb6b3652cd10eb50ec4c4
parent 7f2d6ce0586dc33f075b1d5733b3715eb3dd4f0c

Fix crash in AllInOneTetherSettings when user is not admin

When user is not admin, we should skip the setup and tear down
procedures in AllInOneTetherSettings' lifecycle. Also, the switch for
"Hotspot & tethering" on "Network & internet" should be disabled in such
case.

Bug: 151648198
Test: Build and flashed to crosshatch device. Using guest user, the
settings won't crash when using AllInOneTetherSetting and the switch is
disabled.

Change-Id: Ibd2f4111c53b8b9fa6a18504a681a27b966a3c46

src/com/android/settings/AllInOneTetherSettings.java

diff --git a/src/com/android/settings/AllInOneTetherSettings.java b/src/com/android/settings/AllInOneTetherSettings.java
index 69edf43..c562fae 100644
--- a/src/com/android/settings/AllInOneTetherSettings.java
+++ b/src/com/android/settings/AllInOneTetherSettings.java
@@ -249,18 +249,31 @@
     @Override
     public void onResume() {
         super.onResume();
-        mTetherEnabler.addListener(mStateUpdateListener);
+        if (mUnavailable) {
+            return;
+        }
+        if (mTetherEnabler != null) {
+            mTetherEnabler.addListener(mStateUpdateListener);
+        }
     }
 
     @Override
     public void onPause() {
         super.onPause();
-        mTetherEnabler.removeListener(mStateUpdateListener);
+        if (mUnavailable) {
+            return;
+        }
+        if (mTetherEnabler != null) {
+            mTetherEnabler.removeListener(mStateUpdateListener);
+        }
     }
 
     @Override
     public void onStop() {
         super.onStop();
+        if (mUnavailable) {
+            return;
+        }
         final Context context = getContext();
         if (context != null) {
             context.unregisterReceiver(mTetherChangeReceiver);