From aa864953b7e35533c5bf28596c01cab7e5fe4506 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Fri, 18 Mar 2016 14:40:42 -0400
Subject: [PATCH] Guard against crash in dev options

Bug: 27480962
Change-Id: I22d799f8796f94febda7bd49eb7431d29201e37f
---
 src/com/android/settings/DevelopmentSettings.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index e33c0816eb4..01cc139a93a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1720,6 +1720,9 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
         DialogInterface.OnDismissListener onDismissListener = new DialogInterface.OnDismissListener() {
             @Override
             public void onDismiss(DialogInterface dialog) {
+                if (getActivity() == null) {
+                    return;
+                }
                 updateAllOptions();
             }
         };