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

Commit d13e3396 authored by Russell Brenner's avatar Russell Brenner Committed by Android (Google) Code Review
Browse files

Merge "Pass flag to indicate multiple users on device" into jb-mr1-dev

parents 6258a0e2 84d04c20

src/com/android/settings/accounts/AddAccountSettings.java

+5 −1
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ public class AddAccountSettings extends Activity { 


    /* package */ static final String EXTRA_SELECTED_ACCOUNT = "selected_account";



    // show additional info regarding the use of a device with multiple users

    static final String EXTRA_HAS_MULTIPLE_USERS = "hasMultipleUsers";



    private static final int CHOOSE_ACCOUNT_REQUEST = 1;



    private static final int DLG_MULTIUSER_WARNING = 1;
@@ -193,6 +196,7 @@ public class AddAccountSettings extends Activity { 
        Bundle addAccountOptions = new Bundle();

        mPendingIntent = PendingIntent.getBroadcast(this, 0, new Intent(), 0);

        addAccountOptions.putParcelable(KEY_CALLER_IDENTITY, mPendingIntent);

        addAccountOptions.putBoolean(EXTRA_HAS_MULTIPLE_USERS, Utils.hasMultipleUsers(this));

        AccountManager.get(this).addAccount(

                accountType,

                null, /* authTokenType */