Merge "Fix settings crash during factory reset."

This commit is contained in:
Julia Reynolds
2015-08-19 20:40:35 +00:00
committed by Android (Google) Code Review

View File

@@ -78,8 +78,10 @@ public class MasterClearConfirm extends InstrumentedFragment {
@Override @Override
protected void onPostExecute(Void aVoid) { protected void onPostExecute(Void aVoid) {
mProgressDialog.hide(); mProgressDialog.hide();
getActivity().setRequestedOrientation(mOldOrientation); if (getActivity() != null) {
doMasterClear(); getActivity().setRequestedOrientation(mOldOrientation);
doMasterClear();
}
} }
@Override @Override