From dd5693c6f4640de657b27ecd7758b23c663d64ab Mon Sep 17 00:00:00 2001
From: Doris Ling <dling@google.com>
Date: Fri, 24 Mar 2017 13:10:09 -0700
Subject: [PATCH] Fix crash in TetherSettings.

In onCreate(), it checkes whether ui is restricted, and try to show an
empty screen by creating a new preference screen. However, when the
preference is not attached, it failed to get the next preference id.
Instead of replacing the current screen with a new one, remove all the
preferences on the screen.

Change-Id: I085bee025cfeabaf4aefacb717d145e668bd85e1
Fix: 36589767
Test: manual
---
 src/com/android/settings/TetherSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 61cad39f2cb..5d797a70886 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -142,7 +142,7 @@ public class TetherSettings extends RestrictedSettingsFragment
         setIfOnlyAvailableForAdmins(true);
         if (isUiRestricted()) {
             mUnavailable = true;
-            setPreferenceScreen(new PreferenceScreen(getPrefContext(), null));
+            getPreferenceScreen().removeAll();
             return;
         }