ADHOC/replicant-packages_apps_SetupWizard
3
0
Fork 0
Code Issues Pull Requests Releases Activity

GmsAccount: If there's no network and FRP isn't enforcing, skip GMS

Browse Source 
The current version of GMS's SuW has the main activity return as
CANCELED when no network is available. This is the same result as
an actual cancellation (by pressing "Back"), and there's no extra
data to distinguish the two, so the user gets stuck in a loop between
the "no network" page and the one preceding it, unless connectivity
is somehow established. Making connectivity mandatory for OOBE isn't
acceptable, so skip GMS entirely if network is absent (and FRP
isn't enforcing). The only thing it was presenting was a "you
have no network" dialog anyway.

Change-Id: I2abadc79a0823e94da7d3a875ce6db8eae8f143b
This commit is contained in:
Ricardo Cerqueira 2016-10-25 23:25:38 +01:00
parent cca206faa1
commit d82b2dc88a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java
View File

@ -102,7 +102,12 @@ public class GmsAccountPage extends SetupPage {
getCallbacks().onPreviousPage(); getCallbacks().onPreviousPage();
} else { } else {
super.doLoadAction(fragmentManager, action); super.doLoadAction(fragmentManager, action);
if (!SetupWizardUtils.accountExists(mContext, SetupWizardApp.ACCOUNT_TYPE_GMS)) { if (!SetupWizardUtils.isNetworkConnected(mContext) && !SetupWizardUtils.frpEnabled(mContext)) {
if (SetupWizardApp.DEBUG) {
Log.d(TAG, "No network, no FRP enforcement, skip GMS account");
}
getCallbacks().onNextPage();
} else if (!SetupWizardUtils.accountExists(mContext, SetupWizardApp.ACCOUNT_TYPE_GMS)) {
launchGmsAccountSetup(); launchGmsAccountSetup();
} else { } else {
// This can happen if the user goes from setup -> restore, but chooses to set // This can happen if the user goes from setup -> restore, but chooses to set