Projects >> platform_packages_apps_settings >>439033dd93417b98acff392865166503a507ff30

Chunk
Conflicting content
                // if OEM unlock is enabled, this will be wiped during FR process. If disabled, it
                // will be wiped here, unless the device is still being provisioned, in which case
                // the persistent data block will be preserved.
<<<<<<< HEAD
=======
                final ProgressDialog progressDialog = getProgressDialog();
                progressDialog.show();

                // need to prevent orientation changes as we're about to go into
                // a long IO request, so we won't be able to access inflate resources on flash
                final int oldOrientation = getActivity().getRequestedOrientation();
                getActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
>>>>>>> 6967df642114a9c84d993cfd544d5a32f04c26b1
                new AsyncTask() {
                    int mOldOrientation;
                    ProgressDialog mProgressDialog;
Solution content
                // if OEM unlock is enabled, this will be wiped during FR process. If disabled, it
                // will be wiped here, unless the device is still being provisioned, in which case
                // the persistent data block will be preserved.
                new AsyncTask() {
                    int mOldOrientation;
                    ProgressDialog mProgressDialog;
File
MasterClearConfirm.java
Developer's decision
Version 1
Kind of conflict
Comment
Method invocation
Variable