Setupwizard: Make sure to advance if GMS is absent (cb09e29e) · Commits · e / os / android_packages_apps_SetupWizard

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

+22 −20

Original line number	Diff line number	Diff line
		@@ -176,7 +176,7 @@ public class GmsAccountPage extends SetupPage {
		private void launchGmsRestorePage() {
		try {
		// GMS can disable this after logging in sometimes
		SetupWizardUtils.enableGMSSetupWizard(mContext);
		if (SetupWizardUtils.enableGMSSetupWizard(mContext)) {
		Intent intent = new Intent(ACTION_RESTORE);
		intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true);
		intent.putExtra(SetupWizardApp.EXTRA_USE_IMMERSIVE, true);
		@@ -195,12 +195,14 @@ public class GmsAccountPage extends SetupPage {
		mFragment.startActivityForResult(
		intent,
		SetupWizardApp.REQUEST_CODE_RESTORE_GMS, options.toBundle());
		return;
		}
		} catch (Exception e) {
		e.printStackTrace();
		// XXX: In open source, we don't know what gms version a user has.
		// Bail if the restore activity is not found.
		getCallbacks().onNextPage();
		}
		getCallbacks().onNextPage();
		}

		private void launchGmsAccountSetup() {

+4 −2

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ public class SetupWizardUtils {
		}
		}

		public static void enableGMSSetupWizard(Context context) {
		public static boolean enableGMSSetupWizard(Context context) {
		try {
		PackageInfo packageInfo = context.getPackageManager()
		.getPackageInfo(GOOGLE_SETUPWIZARD_PACKAGE,
		@@ -167,8 +167,10 @@ public class SetupWizardUtils {
		enableComponentArray(context, packageInfo.activities);
		enableComponentArray(context, packageInfo.services);
		enableComponentArray(context, packageInfo.receivers);
		return true;
		} catch (PackageManager.NameNotFoundException e) {
		Log.e(TAG, "Unable to disable GMS");
		Log.e(TAG, "Unable to enable GMS");
		return false;
		}
		}