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,9 +78,11 @@ public class MasterClearConfirm extends InstrumentedFragment {
@Override @Override
protected void onPostExecute(Void aVoid) { protected void onPostExecute(Void aVoid) {
mProgressDialog.hide(); mProgressDialog.hide();
if (getActivity() != null) {
getActivity().setRequestedOrientation(mOldOrientation); getActivity().setRequestedOrientation(mOldOrientation);
doMasterClear(); doMasterClear();
} }
}
@Override @Override
protected void onPreExecute() { protected void onPreExecute() {