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

Commit 282c04a9 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Abhisek Devkota
Browse files

SetupWizard: Adjust FRP-enforcing logic 

 * Always pass ALLOW_SKIP to GMS, it's smart enough to know when it
   can't be applied.
 * Don't bring up the authentication screen if no-network and canSkip

Still CYNGNOS-707

Change-Id: Ia1a81c4443cfd5bc3c3e5fd84758ff0ba2a2a140
(cherry picked from commit 649a5ec1)
parent 19df5778

src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ public class GmsAccountPage extends SetupPage { 
    public boolean canSkip() {

        final PersistentDataBlockManager pdbManager = (PersistentDataBlockManager)

                mContext.getSystemService(Context.PERSISTENT_DATA_BLOCK_SERVICE);

        Log.d(TAG,"GMS skip: OEM unlock is enabled: " + pdbManager.getOemUnlockEnabled() + " and amount of PST blocks is " + pdbManager.getDataBlockSize());

        return pdbManager == null

                || pdbManager.getDataBlockSize() == 0

                || pdbManager.getOemUnlockEnabled();