Rename method in master to be consistent with h to fix build breakage
Bug:
Test: build locally and pass
Change-Id: Ieea7970e334c40e5d9e8029792dcfff05b61e926
diff --git a/src/com/android/contacts/common/list/ContactListFilter.java b/src/com/android/contacts/common/list/ContactListFilter.java
index cdea37a..e99de4d 100644
--- a/src/com/android/contacts/common/list/ContactListFilter.java
+++ b/src/com/android/contacts/common/list/ContactListFilter.java
@@ -394,11 +394,11 @@
/**
* Returns true if this ContactListFilter contains at least one Google account.
- * (see {@link #isWritableGoogleTypeFilter )
+ * (see {@link #isGoogleAccountType )
*/
public boolean isSyncable(List<AccountWithDataSet> accounts) {
// TODO(samchen): Check FILTER_TYPE_CUSTOM
- if (isWritableGoogleTypeFilter() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
+ if (isGoogleAccountType() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
return true;
}
if (filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS
@@ -417,12 +417,12 @@
}
/**
- * Returns the Google accounts (see {@link #isWritableGoogleTypeFilter ) for this ContactListFilter.
+ * Returns the Google accounts (see {@link #isGoogleAccountType ) for this ContactListFilter.
*/
public List<Account> getSyncableAccounts(List<AccountWithDataSet> accounts) {
final List<Account> syncableAccounts = new ArrayList<>();
// TODO(samchen): Check FILTER_TYPE_CUSTOM
- if (isWritableGoogleTypeFilter() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
+ if (isGoogleAccountType() && filterType == ContactListFilter.FILTER_TYPE_ACCOUNT) {
syncableAccounts.add(new Account(accountName, accountType));
} else if (filterType == ContactListFilter.FILTER_TYPE_ALL_ACCOUNTS
|| filterType == ContactListFilter.FILTER_TYPE_DEFAULT) {
@@ -441,7 +441,7 @@
* Returns true if this ContactListFilter is Google account type. (i.e. where
* accountType = "com.google" and dataSet = null)
*/
- public boolean isWritableGoogleTypeFilter() {
+ public boolean isGoogleAccountType() {
return GoogleAccountType.ACCOUNT_TYPE.equals(accountType) && dataSet == null;
}
}