diff options
| author | Jigar Thakkar <jigarthakkar@google.com> | 2023-05-19 18:23:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-05-19 18:23:06 +0000 |
| commit | 627cdd23490205aac9acfefbac7a9836a4493679 (patch) | |
| tree | 712b2466e24f7151d29d988a4968d6b948baf5e3 | |
| parent | 3ccb143429788da79561d423a148faa1f82d02c7 (diff) | |
| parent | 8911d21fbd274cd023f1d7ca52f82ee09ebbfb78 (diff) | |
| download | ContactsProvider-627cdd23490205aac9acfefbac7a9836a4493679.tar.gz | |
Merge "Remove app-cloning device config flags" into udc-dev am: 8911d21fbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/ContactsProvider/+/23300936
Change-Id: I824000f55f98701d163fd8b8364f176d3841b874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index c38cc364..a752ee57 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -140,7 +140,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; @@ -1538,8 +1537,6 @@ public class ContactsProvider2 extends AbstractContactsProvider private Set<PhoneAccountHandle> 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 @@ -1615,7 +1612,6 @@ public class ContactsProvider2 extends AbstractContactsProvider mFastScrollingIndexCache = FastScrollingIndexCache.getInstance(getContext()); mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class); - mAppCloningDeviceConfigHelper = AppCloningDeviceConfigHelper.getInstance(getContext()); mContactsHelper = getDatabaseHelper(); mDbHelper.set(mContactsHelper); @@ -2202,8 +2198,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); } /** |