commit 8a38801bcf2eed131d11b1fec297c2c5217d0436
author Julia Reynolds <juliacr@google.com> Wed Aug 19 16:19:55 2015 -0400
committer Julia Reynolds <juliacr@google.com> Wed Aug 19 16:19:55 2015 -0400
tree bf1d225a9dd908a9e23af28ea88abe3554a38b7d
parent e492ee06adbf4661d8b8b53f41f236c9173c5ca4

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

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