diff options
| author | Liana Kazanova <lkazanova@google.com> | 2023-05-19 20:28:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-05-19 20:28:41 +0000 |
| commit | 198236e095e42c3efe9e12e0253d9335f660a6ae (patch) | |
| tree | 57daf383005de21eb76ca9e1c9153ac4df63e053 | |
| parent | 8911d21fbd274cd023f1d7ca52f82ee09ebbfb78 (diff) | |
| parent | 1686ea04fc12eeafc72d3b17eac321d589b0142f (diff) | |
| download | ContactsProvider-198236e095e42c3efe9e12e0253d9335f660a6ae.tar.gz | |
Merge "Revert "Remove app-cloning device config flags"" into udc-dev
| -rw-r--r-- | src/com/android/providers/contacts/ContactsProvider2.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/providers/contacts/ContactsProvider2.java b/src/com/android/providers/contacts/ContactsProvider2.java index a752ee57..c38cc364 100644 --- a/src/com/android/providers/contacts/ContactsProvider2.java +++ b/src/com/android/providers/contacts/ContactsProvider2.java @@ -140,6 +140,7 @@ 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; @@ -1537,6 +1538,8 @@ 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 @@ -1612,6 +1615,7 @@ public class ContactsProvider2 extends AbstractContactsProvider mFastScrollingIndexCache = FastScrollingIndexCache.getInstance(getContext()); mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class); + mAppCloningDeviceConfigHelper = AppCloningDeviceConfigHelper.getInstance(getContext()); mContactsHelper = getDatabaseHelper(); mDbHelper.set(mContactsHelper); @@ -2198,7 +2202,8 @@ public class ContactsProvider2 extends AbstractContactsProvider */ @VisibleForTesting protected boolean isContactSharingEnabledForCloneProfile() { - return getContext().getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks); + return getContext().getResources().getBoolean(R.bool.config_enableAppCloningBuildingBlocks) + && mAppCloningDeviceConfigHelper.getEnableAppCloningBuildingBlocks(); } /** |