diff options
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/SetupWizardApp.java | 1 | ||||
| -rw-r--r-- | src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java index 9651f07..dca32b7 100644 --- a/src/com/cyanogenmod/setupwizard/SetupWizardApp.java +++ b/src/com/cyanogenmod/setupwizard/SetupWizardApp.java @@ -55,6 +55,7 @@ public class SetupWizardApp extends Application { public static final String EXTRA_DETAILS = "details"; public static final String EXTRA_FRAGMENT = "fragment"; public static final String EXTRA_ACTION_ID = "actionId"; + public static final String EXTRA_SUPRESS_D2D_SETUP = "suppress_device_to_device_setup"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java index 2285a4c..877f9ac 100644 --- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java @@ -27,6 +27,7 @@ import android.app.Fragment; import android.app.FragmentManager; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.Bundle; import android.service.persistentdata.PersistentDataBlockManager; import android.util.Log; @@ -220,6 +221,9 @@ public class GmsAccountPage extends SetupPage { bundle.putBoolean(SetupWizardApp.EXTRA_FIRST_RUN, true); bundle.putBoolean(SetupWizardApp.EXTRA_ALLOW_SKIP, true); bundle.putBoolean(SetupWizardApp.EXTRA_USE_IMMERSIVE, true); + bundle.putBoolean(SetupWizardApp.EXTRA_SUPRESS_D2D_SETUP, !mContext.getPackageManager() + .hasSystemFeature(PackageManager.FEATURE_NFC)); + AccountManager .get(mContext).addAccount(SetupWizardApp.ACCOUNT_TYPE_GMS, null, null, bundle, null, new AccountManagerCallback<Bundle>() { |