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

Commit 3348f14b authored by Costin Manolache's avatar Costin Manolache
Browse files

Remove GAIA string

parent b4ee8349

core/java/android/accounts/AccountManagerService.java

+11 −5
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ import com.android.internal.R; 
public class AccountManagerService

        extends IAccountManager.Stub

        implements RegisteredServicesCacheListener {

    private static final String GOOGLE_ACCOUNT_TYPE = "com.google.GAIA";

    private static final String GOOGLE_ACCOUNT_TYPE = "com.google";



    private static final String NO_BROADCAST_FLAG = "nobroadcast";
@@ -81,7 +81,7 @@ public class AccountManagerService 


    private static final int TIMEOUT_DELAY_MS = 1000 * 60;

    private static final String DATABASE_NAME = "accounts.db";

    private static final int DATABASE_VERSION = 3;

    private static final int DATABASE_VERSION = 4;



    private final Context mContext;
@@ -1379,6 +1379,12 @@ public class AccountManagerService 
                createAccountsDeletionTrigger(db);

                oldVersion++;

            }



            if (oldVersion == 3) {

                db.execSQL("UPDATE " + TABLE_ACCOUNTS + " SET " + ACCOUNTS_TYPE +

                        " = 'com.google' WHERE " + ACCOUNTS_TYPE + " == 'com.google.GAIA'");

                oldVersion++;

            }

        }



        @Override

core/java/android/content/AbstractSyncableContentProvider.java

+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public abstract class AbstractSyncableContentProvider extends SyncableContentPro 
                        // AbstractGDataSyncAdapter, which will put acore into a crash loop

                        ArrayList<Account> gaiaAccounts = new ArrayList<Account>();

                        for (Account acct: accounts) {

                            if (acct.type.equals("com.google.GAIA")) {

                            if (acct.type.equals("com.google")) {

                                gaiaAccounts.add(acct);

                            }

                        }

core/java/android/content/ContentResolver.java

+1 −1
Original line number Diff line number Diff line
@@ -903,7 +903,7 @@ public abstract class ContentResolver { 
        if (extras != null) {

            String accountName = extras.getString(SYNC_EXTRAS_ACCOUNT);

            if (!TextUtils.isEmpty(accountName)) {

                account = new Account(accountName, "com.google.GAIA");

                account = new Account(accountName, "com.google");

            }

            extras.remove(SYNC_EXTRAS_ACCOUNT);

        }

core/java/android/content/SyncStorageEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -1104,7 +1104,7 @@ public class SyncStorageEngine extends Handler { 
                                String accountType = parser.getAttributeValue(

                                        null, "type");

                                if (accountType == null) {

                                    accountType = "com.google.GAIA";

                                    accountType = "com.google";

                                }

                                String authorityName = parser.getAttributeValue(

                                        null, "authority");
@@ -1272,7 +1272,7 @@ public class SyncStorageEngine extends Handler { 
                String accountType = hasType

                        ? c.getString(c.getColumnIndex("account_type")) : null;

                if (accountType == null) {

                    accountType = "com.google.GAIA";

                    accountType = "com.google";

                }

                String authorityName = c.getString(c.getColumnIndex("authority"));

                AuthorityInfo authority = this.getOrCreateAuthorityLocked(

core/java/android/pim/vcard/ContactStruct.java

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ public class ContactStruct { 
    }

    

    // From GoogleSource.java in Contacts app.

    private static final String ACCOUNT_TYPE_GOOGLE = "com.google.GAIA";

    private static final String ACCOUNT_TYPE_GOOGLE = "com.google";

    private static final String GOOGLE_MY_CONTACTS_GROUP = "System Group: My Contacts";



    public void pushIntoContentResolver(ContentResolver resolver) {