From 19dba59fa0e2a04e976582829a6655aafbebf097 Mon Sep 17 00:00:00 2001 From: kholoud mohamed Date: Mon, 31 Jan 2022 16:17:34 +0000 Subject: [PATCH] change getString/Drawable return value annotations to @Nullable Bug: 217133492 Bug: 203548565 Bug: 211422509 Bug: 188410712 Test: N/A Change-Id: I807b23fa09968b2c4e90e885b6115f3f1efde43f --- core/api/current.txt | 8 ++++---- core/api/system-current.txt | 4 ++-- core/java/android/app/admin/DevicePolicyManager.java | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index 11e0a6bfb151..82bd8d28252f 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -7311,10 +7311,10 @@ package android.app.admin { method @Nullable public java.util.List getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String); method @NonNull public java.util.List getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String); method public CharSequence getDeviceOwnerLockScreenInfo(); - method @NonNull public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable); - method @NonNull public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable); - method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable); - method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable); + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable); + method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable); + method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable); method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName); method @NonNull public String getEnrollmentSpecificId(); method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName); diff --git a/core/api/system-current.txt b/core/api/system-current.txt index d6e48157063c..c35cd1498e80 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1058,8 +1058,8 @@ package android.app.admin { method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List getPermittedInputMethodsForCurrentUser(); method @Nullable public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException; method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public String getProfileOwnerNameAsUser(int) throws java.lang.IllegalArgumentException; - method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable); - method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable, @NonNull java.lang.Object...); + method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable); + method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable, @NonNull java.lang.Object...); method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}) public int getUserProvisioningState(); method public boolean isDeviceManaged(); method @RequiresPermission(android.Manifest.permission.MANAGE_USERS) public boolean isDeviceProvisioned(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 75a00afe13ad..c1f57400de8f 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -15009,7 +15009,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawable( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15037,7 +15037,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawable( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15094,7 +15094,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawableForDensity( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15127,7 +15127,7 @@ public class DevicePolicyManager { * @param defaultDrawableLoader To get the default drawable if no updated drawable was set for * the provided params. */ - @NonNull + @Nullable public Drawable getDrawableForDensity( @NonNull @DevicePolicyResources.UpdatableDrawableId String drawableId, @NonNull @DevicePolicyResources.UpdatableDrawableStyle String drawableStyle, @@ -15249,7 +15249,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @NonNull + @Nullable public String getString( @NonNull @DevicePolicyResources.UpdatableStringId String stringId, @NonNull Callable defaultStringLoader) { @@ -15295,7 +15295,7 @@ public class DevicePolicyManager { * @hide */ @SystemApi - @NonNull + @Nullable @SuppressLint("SamShouldBeLast") public String getString( @NonNull @DevicePolicyResources.UpdatableStringId String stringId, -- GitLab