commit 33cbc9a1255f0fc03e058f843309eeebbb60e08d
author Anton Hansson <hansson@google.com> Tue Jun 08 08:55:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jun 08 08:55:16 2021 +0000
tree b9dff9f6f47fcd8b8fedb4afa77d654f39adc7c9
parent f4c13453549e355dd752aca880d7eaf2fa2fc565
parent 73db344e44ff180339706b039ee44fb8cd64b8d0

Merge "Suppress Api Lint errors on shipped APIs" into sc-dev am: 73db344e44

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/14853993

Change-Id: I545061ac2a84bf1d4e910eb60b8d86f2df734cf3

framework-s/java/android/app/role/RoleManager.java

diff --git a/framework-s/java/android/app/role/RoleManager.java b/framework-s/java/android/app/role/RoleManager.java
index 3e3525a..8a65dfa 100644
--- a/framework-s/java/android/app/role/RoleManager.java
+++ b/framework-s/java/android/app/role/RoleManager.java
@@ -22,6 +22,7 @@
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.RequiresPermission;
+import android.annotation.SuppressLint;
 import android.annotation.SystemApi;
 import android.annotation.SystemService;
 import android.annotation.UserIdInt;
@@ -454,6 +455,7 @@
      * @hide
      */
     @RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS)
+    @SuppressLint("SamShouldBeLast") // TODO(b/190240500): remove this
     @SystemApi
     public void addOnRoleHoldersChangedListenerAsUser(@CallbackExecutor @NonNull Executor executor,
             @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {
@@ -499,6 +501,7 @@
      * @hide
      */
     @RequiresPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS)
+    @SuppressLint("SamShouldBeLast") // TODO(b/190240500): remove this
     @SystemApi
     public void removeOnRoleHoldersChangedListenerAsUser(
             @NonNull OnRoleHoldersChangedListener listener, @NonNull UserHandle user) {