Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc1c61a2 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "change getString/Drawable return value annotations to @Nullable"

parents b6bd1795 19dba59f

core/api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -7306,10 +7306,10 @@ package android.app.admin { 
    method @Nullable public java.util.List<java.lang.String> getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String);

    method @NonNull public java.util.List<java.lang.String> 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<android.graphics.drawable.Drawable>);

    method @NonNull public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @NonNull public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.concurrent.Callable<android.graphics.drawable.Drawable>);

    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);

core/api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1062,8 +1062,8 @@ package android.app.admin { 
    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.QUERY_ADMIN_POLICY}) public java.util.List<java.lang.String> 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<java.lang.String>);

    method @NonNull public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>, @NonNull java.lang.Object...);

    method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>);

    method @Nullable public String getString(@NonNull String, @NonNull java.util.concurrent.Callable<java.lang.String>, @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();

core/java/android/app/admin/DevicePolicyManager.java

+6 −6
Original line number Diff line number Diff line
@@ -15014,7 +15014,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,
@@ -15042,7 +15042,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,
@@ -15099,7 +15099,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,
@@ -15132,7 +15132,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,
@@ -15254,7 +15254,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @NonNull

    @Nullable

    public String getString(

            @NonNull @DevicePolicyResources.UpdatableStringId String stringId,

            @NonNull Callable<String> defaultStringLoader) {
@@ -15300,7 +15300,7 @@ public class DevicePolicyManager { 
     * @hide

     */

    @SystemApi

    @NonNull

    @Nullable

    @SuppressLint("SamShouldBeLast")

    public String getString(

            @NonNull @DevicePolicyResources.UpdatableStringId String stringId,