PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve FRP lock if wiped during SUW

Browse Source 
Guard against FRP attacks by keeping the persistent data block
intact, if a factory reset has been issued during SUW.

[resolves merge conflicts with ag/808069]

Bug: 25290269
Change-Id: Id26b4c10235ad126632b71875592a4fa70a39b24
This commit is contained in:
Russell Brenner
2015-11-05 16:03:20 -08:00
parent 1538dde4fb
commit de4fc8eb2a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/MasterClearConfirm.java
View File

@@ -20,6 +20,7 @@ import android.app.ProgressDialog;
import android.content.Context; import android.content.Context;
import android.content.pm.ActivityInfo; import android.content.pm.ActivityInfo;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.provider.Settings;
import android.service.persistentdata.PersistentDataBlockManager; import android.service.persistentdata.PersistentDataBlockManager;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
@@ -63,8 +64,12 @@ public class MasterClearConfirm extends InstrumentedFragment {
final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager) final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)
getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE); getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);
if (pdbManager != null && !pdbManager.getOemUnlockEnabled()) { if (pdbManager != null && !pdbManager.getOemUnlockEnabled() &&
// if OEM unlock is enabled, this will be wiped during FR process. Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.DEVICE_PROVISIONED, 0) != 0) {
// 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<Void, Void, Void>() { new AsyncTask<Void, Void, Void>() {
int mOldOrientation; int mOldOrientation;
ProgressDialog mProgressDialog; ProgressDialog mProgressDialog;