Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change to use android.provider.new_default_account_api_enabled flag to control the contacts storage settings launch. Bug: 368641291 Flag: android.provider.new_default_account_api_enabled" into main

Browse Source
This commit is contained in:
Dongzhuo Zhang
2024-10-25 03:09:09 +00:00
committed by Android (Google) Code Review
parent c7acd88a83 b48d9f0e56
commit b95032af46
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/applications/contacts/ContactsStoragePreferenceController.java
View File

@@ -21,11 +21,11 @@ import android.accounts.Account;
import android.content.Context;
import android.os.UserHandle;
import android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState;
import android.provider.Flags;
import android.util.Log;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.flags.Flags;
import com.android.settingslib.accounts.AuthenticatorHelper;
/**
@@ -54,7 +54,7 @@ public class ContactsStoragePreferenceController extends BasePreferenceControlle
@Override
public int getAvailabilityStatus() {
return (Flags.enableContactsDefaultAccountInSettings()
return (Flags.newDefaultAccountApiEnabled()
&& mCurrentDefaultAccountAndState != null) ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}