From 8a38801bcf2eed131d11b1fec297c2c5217d0436 Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Wed, 19 Aug 2015 16:19:55 -0400
Subject: [PATCH] Fix settings crash during factory reset.

If you close and then launch settings before the persistent
data block wipe is finished.
Bug: 20458454

Change-Id: I07bf79f25bcb30ac8932925aa7b77b9a95d16e20
---
 src/com/android/settings/MasterClearConfirm.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 7319a4e98dd..12a86dea8ef 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -78,8 +78,10 @@ public class MasterClearConfirm extends InstrumentedFragment {
                     @Override
                     protected void onPostExecute(Void aVoid) {
                         mProgressDialog.hide();
-                        getActivity().setRequestedOrientation(mOldOrientation);
-                        doMasterClear();
+                        if (getActivity() != null) {
+                            getActivity().setRequestedOrientation(mOldOrientation);
+                            doMasterClear();
+                        }
                     }
 
                     @Override