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: Ie0dd1c234efcac0ae618fcd8dfbb53bc81401d05
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) {