From 6ce8cae63d71a9e46aac338044ee0bd23b8293a8 Mon Sep 17 00:00:00 2001 From: Jigar Thakkar Date: Wed, 17 May 2023 21:35:12 +0000 Subject: Remove app-cloning device config flags With this change we remove the device config feature flag check in the contacts provider codebase. Test: atest ContactsSharingTest Bug: 250961871 Change-Id: I86ca2863e11d42d2bc8daae2d19025becd8f3963 --- src/com/android/providers/contacts/ContactsProvider2.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index f4ce5c74..239eab8a 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -142,7 +142,6 @@ import com.android.common.content.SyncStateContentProviderHelper; import com.android.common.io.MoreCloseables; import com.android.internal.R; import com.android.internal.annotations.GuardedBy; -import com.android.internal.config.appcloning.AppCloningDeviceConfigHelper; import com.android.internal.util.ArrayUtils; import com.android.providers.contacts.ContactLookupKey.LookupKeySegment; import com.android.providers.contacts.ContactsDatabaseHelper.AccountsColumns; @@ -1540,8 +1539,6 @@ public class ContactsProvider2 extends AbstractContactsProvider private Set mMigratedPhoneAccountHandles; - private AppCloningDeviceConfigHelper mAppCloningDeviceConfigHelper; - /** * Subscription change will trigger ACTION_PHONE_ACCOUNT_REGISTERED that broadcasts new * PhoneAccountHandle that is created based on the new subscription. This receiver is used @@ -1617,7 +1614,6 @@ public class ContactsProvider2 extends AbstractContactsProvider mFastScrollingIndexCache = FastScrollingIndexCache.getInstance(getContext()); mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class); - mAppCloningDeviceConfigHelper = AppCloningDeviceConfigHelper.getInstance(getContext()); mContactsHelper = getDatabaseHelper(); mDbHelper.set(mContactsHelper); @@ -2204,8 +2200,7 @@ public class ContactsProvider2 extends AbstractContactsProvider */ @VisibleForTesting protected boolean isContactSharingEnabledForCloneProfile() { - return getContext().getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks) - && mAppCloningDeviceConfigHelper.getEnableAppCloningBuildingBlocks(); + return getContext().getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks); } /** -- cgit v1.2.3