Added DefaultAccountAndState#DEFAULT_ACCOUNT_STATE_SIM to support SIM (e3a210a8) · Commits · e / os / android_frameworks_base

core/api/current.txt

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36918,14 +36918,16 @@ package android.provider {

	@FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState {		@FlaggedApi("android.provider.new_default_account_api_enabled") public static final class ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState {
	ctor public ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState(int, @Nullable android.accounts.Account);		ctor public ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState(int, @Nullable android.accounts.Account);
	method @Nullable public android.accounts.Account getCloudAccount();		method @Nullable public android.accounts.Account getAccount();
	method public int getState();		method public int getState();
	method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofCloud(@NonNull android.accounts.Account);		method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofCloud(@NonNull android.accounts.Account);
	method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofLocal();		method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofLocal();
	method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofNotSet();		method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofNotSet();
			method @NonNull public static android.provider.ContactsContract.RawContacts.DefaultAccount.DefaultAccountAndState ofSim(@NonNull android.accounts.Account);
	field public static final int DEFAULT_ACCOUNT_STATE_CLOUD = 3; // 0x3		field public static final int DEFAULT_ACCOUNT_STATE_CLOUD = 3; // 0x3
	field public static final int DEFAULT_ACCOUNT_STATE_LOCAL = 2; // 0x2		field public static final int DEFAULT_ACCOUNT_STATE_LOCAL = 2; // 0x2
	field public static final int DEFAULT_ACCOUNT_STATE_NOT_SET = 1; // 0x1		field public static final int DEFAULT_ACCOUNT_STATE_NOT_SET = 1; // 0x1
			field public static final int DEFAULT_ACCOUNT_STATE_SIM = 4; // 0x4
	}		}

	public static final class ContactsContract.RawContacts.DisplayPhoto {		public static final class ContactsContract.RawContacts.DisplayPhoto {

core/java/android/provider/ContactsContract.java

+63 −28

Original line number	Original line	Diff line number	Diff line
	@@ -3046,6 +3046,11 @@ public final class ContactsContract {
	* <li> {@link #DEFAULT_ACCOUNT_STATE_CLOUD}: The default account is set to a		* <li> {@link #DEFAULT_ACCOUNT_STATE_CLOUD}: The default account is set to a
	* cloud-synced account. New raw contacts requested for insertion without a specified		* cloud-synced account. New raw contacts requested for insertion without a specified
	* {@link Account} will be saved in the default cloud account. </li>		* {@link Account} will be saved in the default cloud account. </li>
			* <li> {@link #DEFAULT_ACCOUNT_STATE_SIM}: The default account is set to a
			* account that is associated with one of
			* {@link SimContacts#getSimAccounts(ContentResolver)}. New raw contacts requested
			* for insertion without a specified {@link Account} will be
			* saved in this SIM account. </li>
	* </ul>		* </ul>
	*/		*/
	@FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)		@FlaggedApi(Flags.FLAG_NEW_DEFAULT_ACCOUNT_API_ENABLED)
	@@ -3062,21 +3067,29 @@ public final class ContactsContract {
	*/		*/
	public static final int DEFAULT_ACCOUNT_STATE_CLOUD = 3;		public static final int DEFAULT_ACCOUNT_STATE_CLOUD = 3;

			/**
			* A state indicating that the default account is set as an account that is
			* associated with one of {@link SimContacts#getSimAccounts(ContentResolver)}.
			*/
			public static final int DEFAULT_ACCOUNT_STATE_SIM = 4;

	/**		/**
	* The state of the default account. One of		* The state of the default account. One of
	* {@link #DEFAULT_ACCOUNT_STATE_NOT_SET},		* {@link #DEFAULT_ACCOUNT_STATE_NOT_SET},
	* {@link #DEFAULT_ACCOUNT_STATE_LOCAL} or		* {@link #DEFAULT_ACCOUNT_STATE_LOCAL},
	* {@link #DEFAULT_ACCOUNT_STATE_CLOUD}.		* {@link #DEFAULT_ACCOUNT_STATE_CLOUD}
			* {@link #DEFAULT_ACCOUNT_STATE_SIM}.
	*/		*/
	@DefaultAccountState		@DefaultAccountState
	private final int mState;		private final int mState;

	/**		/**
	* The account of the default account, when {@link mState} is {		* The account of the default account, when {@link #mState} is {
	*		*
	* @link #STATE_SET_TO_CLOUD}, or null otherwise.		* @link #DEFAULT_ACCOUNT_STATE_CLOUD} or {@link #DEFAULT_ACCOUNT_STATE_SIM}, or
			* null otherwise.
	*/		*/
	private final Account mCloudAccount;		private final Account mAccount;

	/**		/**
	* Constructs a new `DefaultAccountAndState` instance with the specified state and		* Constructs a new `DefaultAccountAndState` instance with the specified state and
	@@ -3084,23 +3097,22 @@ public final class ContactsContract {
	* account.		* account.
	*		*
	* @param state The state of the default account.		* @param state The state of the default account.
	* @param cloudAccount The cloud account associated with the default account,		* @param account The account associated with the default account if the state is
	* or null if the state is not		* {@link #DEFAULT_ACCOUNT_STATE_CLOUD} or
	* {@link #DEFAULT_ACCOUNT_STATE_CLOUD}.		* {@link #DEFAULT_ACCOUNT_STATE_SIM}, or null otherwise.
	*/		*/
	public DefaultAccountAndState(@DefaultAccountState int state,		public DefaultAccountAndState(@DefaultAccountState int state,
	@Nullable Account cloudAccount) {		@Nullable Account account) {
	if (!isValidDefaultAccountState(state)) {		if (!isValidDefaultAccountState(state)) {
	throw new IllegalArgumentException("Invalid default account state.");		throw new IllegalArgumentException("Invalid default account state.");
	}		}
	if ((state == DEFAULT_ACCOUNT_STATE_CLOUD) != (cloudAccount != null)) {		if (isCloudOrSimAccount(state) != (account != null)) {
	throw new IllegalArgumentException(		throw new IllegalArgumentException(
	"Default account can be set to cloud if and only if the cloud "		"Default account can be set to cloud or SIM if and only if the "
	+ "account is provided.");		+ "account is provided.");
	}		}
	this.mState = state;		this.mState = state;
	this.mCloudAccount =		this.mAccount = isCloudOrSimAccount(state) ? account : null;
	(mState == DEFAULT_ACCOUNT_STATE_CLOUD) ? cloudAccount : null;
	}		}

	/**		/**
	@@ -3118,6 +3130,21 @@ public final class ContactsContract {
	return new DefaultAccountAndState(DEFAULT_ACCOUNT_STATE_CLOUD, cloudAccount);		return new DefaultAccountAndState(DEFAULT_ACCOUNT_STATE_CLOUD, cloudAccount);
	}		}


			/**
			* Creates a `DefaultAccountAndState` instance representing a default account
			* that is set to the sim and associated with the specified sim account.
			*
			* @param simAccount The non-null sim account associated with the default
			* contacts account.
			* @return A new `DefaultAccountAndState` instance with state
			* {@link #DEFAULT_ACCOUNT_STATE_SIM}.
			*/
			public static @NonNull DefaultAccountAndState ofSim(
			@NonNull Account simAccount) {
			return new DefaultAccountAndState(DEFAULT_ACCOUNT_STATE_SIM, simAccount);
			}

	/**		/**
	* Creates a `DefaultAccountAndState` instance representing a default account		* Creates a `DefaultAccountAndState` instance representing a default account
	* that is set to the local device storage.		* that is set to the local device storage.
	@@ -3140,6 +3167,18 @@ public final class ContactsContract {
	return new DefaultAccountAndState(DEFAULT_ACCOUNT_STATE_NOT_SET, null);		return new DefaultAccountAndState(DEFAULT_ACCOUNT_STATE_NOT_SET, null);
	}		}

			private static boolean isCloudOrSimAccount(@DefaultAccountState int state) {
			return state == DEFAULT_ACCOUNT_STATE_CLOUD
			\|\| state == DEFAULT_ACCOUNT_STATE_SIM;
			}

			private static boolean isValidDefaultAccountState(int state) {
			return state == DEFAULT_ACCOUNT_STATE_NOT_SET
			\|\| state == DEFAULT_ACCOUNT_STATE_LOCAL
			\|\| state == DEFAULT_ACCOUNT_STATE_CLOUD
			\|\| state == DEFAULT_ACCOUNT_STATE_SIM;
			}

	/**		/**
	* @return the state of the default account.		* @return the state of the default account.
	*/		*/
	@@ -3149,16 +3188,17 @@ public final class ContactsContract {
	}		}

	/**		/**
	* @return the cloud account associated with the default account, or null if the		* @return the cloud account associated with the default account if the
	* state is not {@link #DEFAULT_ACCOUNT_STATE_CLOUD}.		* state is {@link #DEFAULT_ACCOUNT_STATE_CLOUD} or
			* {@link #DEFAULT_ACCOUNT_STATE_SIM}.
	*/		*/
	public @Nullable Account getCloudAccount() {		public @Nullable Account getAccount() {
	return mCloudAccount;		return mAccount;
	}		}

	@Override		@Override
	public int hashCode() {		public int hashCode() {
	return Objects.hash(mState, mCloudAccount);		return Objects.hash(mState, mAccount);
	}		}

	@Override		@Override
	@@ -3170,14 +3210,8 @@ public final class ContactsContract {
	return false;		return false;
	}		}

	return mState == that.mState && Objects.equals(mCloudAccount,		return mState == that.mState && Objects.equals(mAccount,
	that.mCloudAccount);		that.mAccount);
	}

	private static boolean isValidDefaultAccountState(int state) {
	return state == DEFAULT_ACCOUNT_STATE_NOT_SET
	\|\| state == DEFAULT_ACCOUNT_STATE_LOCAL
	\|\| state == DEFAULT_ACCOUNT_STATE_CLOUD;
	}		}

	/**		/**
	@@ -3189,7 +3223,8 @@ public final class ContactsContract {
	@IntDef(		@IntDef(
	prefix = {"DEFAULT_ACCOUNT_STATE_"},		prefix = {"DEFAULT_ACCOUNT_STATE_"},
	value = {DEFAULT_ACCOUNT_STATE_NOT_SET,		value = {DEFAULT_ACCOUNT_STATE_NOT_SET,
	DEFAULT_ACCOUNT_STATE_LOCAL, DEFAULT_ACCOUNT_STATE_CLOUD})		DEFAULT_ACCOUNT_STATE_LOCAL, DEFAULT_ACCOUNT_STATE_CLOUD,
			DEFAULT_ACCOUNT_STATE_SIM})
	public @interface DefaultAccountState {		public @interface DefaultAccountState {
	}		}
	}		}