Merge "Add 'E2ee' prefix to class names." into main (9dff34ba) · Commits · e / os / android_frameworks_base

core/api/current.txt

+48 −48

Original line number	Diff line number	Diff line
		@@ -35817,54 +35817,6 @@ package android.provider {
		field public static final String LONGITUDE = "longitude";
		}

		@FlaggedApi("android.provider.user_keys") public final class ContactKeysManager {
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.ContactKey> getAllContactKeys(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.SelfKey> getAllSelfKeys();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public android.provider.ContactKeysManager.ContactKey getContactKey(@NonNull String, @NonNull String, @NonNull String);
		method public static int getMaxKeySizeBytes();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.ContactKey> getOwnerContactKeys(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.ContactKeysManager.SelfKey> getOwnerSelfKeys();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public android.provider.ContactKeysManager.SelfKey getSelfKey(@NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean removeContactKey(@NonNull String, @NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean removeSelfKey(@NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateContactKeyLocalVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateContactKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public void updateOrInsertContactKey(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateOrInsertSelfKey(@NonNull String, @NonNull String, @NonNull byte[]);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, int);
		field public static final int VERIFICATION_STATE_UNVERIFIED = 0; // 0x0
		field public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1; // 0x1
		field public static final int VERIFICATION_STATE_VERIFIED = 2; // 0x2
		}

		public static final class ContactKeysManager.ContactKey implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getAccountId();
		method @Nullable public String getDeviceId();
		method @Nullable public String getDisplayName();
		method @Nullable public String getEmailAddress();
		method @Nullable public byte[] getKeyValue();
		method public int getLocalVerificationState();
		method @NonNull public String getOwnerPackageName();
		method @Nullable public String getPhoneNumber();
		method public int getRemoteVerificationState();
		method public long getTimeUpdated();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.provider.ContactKeysManager.ContactKey> CREATOR;
		}

		public static final class ContactKeysManager.SelfKey implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getAccountId();
		method @Nullable public String getDeviceId();
		method @Nullable public byte[] getKeyValue();
		method @NonNull public String getOwnerPackageName();
		method public int getRemoteVerificationState();
		method public long getTimeUpdated();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.provider.ContactKeysManager.SelfKey> CREATOR;
		}

		@Deprecated public class Contacts {
		field @Deprecated public static final String AUTHORITY = "contacts";
		field @Deprecated public static final android.net.Uri CONTENT_URI;
		@@ -37165,6 +37117,54 @@ package android.provider {
		method public final int update(android.net.Uri, android.content.ContentValues, String, String[]);
		}

		@FlaggedApi("android.provider.user_keys") public final class E2eeContactKeysManager {
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.E2eeContactKeysManager.E2eeContactKey> getAllE2eeContactKeys(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.E2eeContactKeysManager.E2eeSelfKey> getAllE2eeSelfKeys();
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public android.provider.E2eeContactKeysManager.E2eeContactKey getE2eeContactKey(@NonNull String, @NonNull String, @NonNull String);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public android.provider.E2eeContactKeysManager.E2eeSelfKey getE2eeSelfKey(@NonNull String, @NonNull String);
		method public static int getMaxKeySizeBytes();
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.E2eeContactKeysManager.E2eeContactKey> getOwnerE2eeContactKeys(@NonNull String);
		method @NonNull @RequiresPermission(android.Manifest.permission.READ_CONTACTS) public java.util.List<android.provider.E2eeContactKeysManager.E2eeSelfKey> getOwnerE2eeSelfKeys();
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean removeE2eeContactKey(@NonNull String, @NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean removeE2eeSelfKey(@NonNull String, @NonNull String);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateE2eeContactKeyLocalVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateE2eeContactKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateE2eeSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, int);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public void updateOrInsertE2eeContactKey(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
		method @RequiresPermission(android.Manifest.permission.WRITE_CONTACTS) public boolean updateOrInsertE2eeSelfKey(@NonNull String, @NonNull String, @NonNull byte[]);
		field public static final int VERIFICATION_STATE_UNVERIFIED = 0; // 0x0
		field public static final int VERIFICATION_STATE_VERIFICATION_FAILED = 1; // 0x1
		field public static final int VERIFICATION_STATE_VERIFIED = 2; // 0x2
		}

		public static final class E2eeContactKeysManager.E2eeContactKey implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getAccountId();
		method @Nullable public String getDeviceId();
		method @Nullable public String getDisplayName();
		method @Nullable public String getEmailAddress();
		method @Nullable public byte[] getKeyValue();
		method public int getLocalVerificationState();
		method @NonNull public String getOwnerPackageName();
		method @Nullable public String getPhoneNumber();
		method public int getRemoteVerificationState();
		method public long getTimeUpdated();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.provider.E2eeContactKeysManager.E2eeContactKey> CREATOR;
		}

		public static final class E2eeContactKeysManager.E2eeSelfKey implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public String getAccountId();
		method @Nullable public String getDeviceId();
		method @Nullable public byte[] getKeyValue();
		method @NonNull public String getOwnerPackageName();
		method public int getRemoteVerificationState();
		method public long getTimeUpdated();
		method public void writeToParcel(@NonNull android.os.Parcel, int);
		field @NonNull public static final android.os.Parcelable.Creator<android.provider.E2eeContactKeysManager.E2eeSelfKey> CREATOR;
		}

		@Deprecated public final class FontRequest {
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String);
		ctor @Deprecated public FontRequest(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.List<java.util.List<byte[]>>);

core/api/system-current.txt

+6 −6

Original line number	Diff line number	Diff line
		@@ -11708,12 +11708,6 @@ package android.provider {
		field public static final int ERROR_UNKNOWN = 0; // 0x0
		}

		@FlaggedApi("android.provider.user_keys") public final class ContactKeysManager {
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateContactKeyLocalVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateContactKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		}

		@Deprecated public static final class ContactsContract.MetadataSync implements android.provider.BaseColumns android.provider.ContactsContract.MetadataSyncColumns {
		field @Deprecated public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/contact_metadata";
		field @Deprecated public static final String CONTENT_TYPE = "vnd.android.cursor.dir/contact_metadata";
		@@ -11771,6 +11765,12 @@ package android.provider {
		field public static final int FLAG_REMOVABLE_USB = 524288; // 0x80000
		}

		@FlaggedApi("android.provider.user_keys") public final class E2eeContactKeysManager {
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateE2eeContactKeyLocalVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateE2eeContactKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, @NonNull String, int);
		method @RequiresPermission(allOf={android.Manifest.permission.WRITE_VERIFICATION_STATE_E2EE_CONTACT_KEYS, android.Manifest.permission.WRITE_CONTACTS}) public boolean updateE2eeSelfKeyRemoteVerificationState(@NonNull String, @NonNull String, @NonNull String, int);
		}

		public abstract class SearchIndexableData {
		ctor public SearchIndexableData();
		ctor public SearchIndexableData(android.content.Context);

core/java/android/app/SystemServiceRegistry.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -212,7 +212,7 @@ import android.permission.PermissionControllerManager;
		import android.permission.PermissionManager;
		import android.print.IPrintManager;
		import android.print.PrintManager;
		import android.provider.ContactKeysManager;
		import android.provider.E2eeContactKeysManager;
		import android.safetycenter.SafetyCenterFrameworkInitializer;
		import android.scheduling.SchedulingFrameworkInitializer;
		import android.security.FileIntegrityManager;
		@@ -1608,16 +1608,16 @@ public final class SystemServiceRegistry {
		}
		});

		registerService(Context.CONTACT_KEYS_SERVICE, ContactKeysManager.class,
		new CachedServiceFetcher<ContactKeysManager>() {
		registerService(Context.CONTACT_KEYS_SERVICE, E2eeContactKeysManager.class,
		new CachedServiceFetcher<E2eeContactKeysManager>() {
		@Override
		public ContactKeysManager createService(ContextImpl ctx)
		public E2eeContactKeysManager createService(ContextImpl ctx)
		throws ServiceNotFoundException {
		if (!android.provider.Flags.userKeys()) {
		throw new ServiceNotFoundException(
		"ContactKeysManager is not supported");
		}
		return new ContactKeysManager(ctx);
		return new E2eeContactKeysManager(ctx);
		}});

		// DO NOT do a flag check like this unless the flag is read-only.

core/java/android/content/Context.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -83,6 +83,7 @@ import android.os.StatFs;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.os.storage.StorageManager;
		import android.provider.E2eeContactKeysManager;
		import android.provider.MediaStore;
		import android.telephony.TelephonyRegistryManager;
		import android.util.AttributeSet;
		@@ -6566,10 +6567,10 @@ public abstract class Context {

		/**
		* Use with {@link #getSystemService(String)} to retrieve a
		* {@link android.provider.ContactKeysManager} to managing contact keys.
		* {@link E2eeContactKeysManager} to managing contact keys.
		*
		* @see #getSystemService(String)
		* @see android.provider.ContactKeysManager
		* @see E2eeContactKeysManager
		*/
		@FlaggedApi(android.provider.Flags.FLAG_USER_KEYS)
		public static final String CONTACT_KEYS_SERVICE = "contact_keys";

core/java/android/provider/ContactKeysManager.java→core/java/android/provider/E2eeContactKeysManager.java

+209 −183

File changed and moved.

Preview size limit exceeded, changes collapsed.