Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8739eda authored by Edgar Wang's avatar Edgar Wang
Browse files

Fix "Factory Reset" fails to reset the device 

when device didn't support PersistentDataBlockManager, Settings will
crash at get PersistentDataBlock service.
So we need to check if device support PersistentDataBlockManager
before call getService.

Fixes: 196634851
Test: manual verify on aosp build.
Change-Id: I5afba5df8c4831499478490b442c0fcf367d23ae
parent 18bdecad

src/com/android/settings/MainClearConfirm.java

+8 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.content.pm.ActivityInfo; 
import android.graphics.Color;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import android.service.oemlock.OemLockManager;
@@ -67,6 +68,8 @@ import com.google.android.setupdesign.GlifLayout; 
public class MainClearConfirm extends InstrumentedFragment {

    private static final String TAG = "MainClearConfirm";



    private static final String PERSISTENT_DATA_BLOCK_PROP = "ro.frp.pst";



    @VisibleForTesting View mContentView;

    private boolean mEraseSdCard;

    @VisibleForTesting boolean mEraseEsims;
@@ -83,6 +86,11 @@ public class MainClearConfirm extends InstrumentedFragment { 
                return;

            }



            // pre-flight check hardware support PersistentDataBlockManager

            if (SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("")) {

                return;

            }



            final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                    getActivity().getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);