Merge "Fix settings crash during factory reset."

2015-08-19 20:40:35 +00:00
parent f4d67027d6 8a38801bcf
commit 0a1b513f70
1 changed files with 4 additions and 2 deletions
--- 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