commit fc6b8460a69e975a5f1403d5e6fa028b132e8ec8
author Branden Archer <brarcher@google.com> Tue Jan 30 16:18:50 2024 -0800
committer Branden Archer <brarcher@google.com> Thu Feb 01 15:17:26 2024 -0800
tree eee72d7bcb901092a8010445236ce472127029bb
parent 91eeab07fee84458db4546915b9686471f0dd4d3

Make ContactKeysManager class final

Per API guidelines, manager classes must be final.

Bug: 322979243
Bug: 290696572
Test: atest CtsContactKeysManagerTestCases:ContactKeysManagerTest
Change-Id: Id262fccd415209706da2382b0c7d273d91d1ca14

core/api/current.txt

diff --git a/core/api/current.txt b/core/api/current.txt
index de6addf..88d3987 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -35271,7 +35271,7 @@
     field public static final String LONGITUDE = "longitude";
   }
 
-  @FlaggedApi("android.provider.user_keys") public class ContactKeysManager {
+  @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);

core/api/system-current.txt

diff --git a/core/api/system-current.txt b/core/api/system-current.txt
index 01f54ad..e805248 100644
--- a/core/api/system-current.txt
+++ b/core/api/system-current.txt
@@ -11305,7 +11305,7 @@
     field public static final int ERROR_UNKNOWN = 0; // 0x0
   }
 
-  @FlaggedApi("android.provider.user_keys") public class ContactKeysManager {
+  @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);

core/java/android/provider/ContactKeysManager.java

diff --git a/core/java/android/provider/ContactKeysManager.java b/core/java/android/provider/ContactKeysManager.java
index bef6456..5108f1b 100644
--- a/core/java/android/provider/ContactKeysManager.java
+++ b/core/java/android/provider/ContactKeysManager.java
@@ -71,7 +71,7 @@
  * ContactsProvider.
  */
 @FlaggedApi(Flags.FLAG_USER_KEYS)
-public class ContactKeysManager {
+public final class ContactKeysManager {
     /**
      * The authority for the contact keys provider.
      * @hide