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

Commit 38c8934b authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "API: Fix missing @NonNull annotations"

parents 2288bdc9 918c4f10

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -11500,7 +11500,7 @@ package android.content.pm { 
    method public abstract java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);

    method public abstract android.graphics.drawable.Drawable getApplicationBanner(android.content.pm.ApplicationInfo);

    method public abstract android.graphics.drawable.Drawable getApplicationBanner(String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract int getApplicationEnabledSetting(String);

    method public abstract int getApplicationEnabledSetting(@NonNull String);

    method public abstract android.graphics.drawable.Drawable getApplicationIcon(android.content.pm.ApplicationInfo);

    method public abstract android.graphics.drawable.Drawable getApplicationIcon(String) throws android.content.pm.PackageManager.NameNotFoundException;

    method public abstract android.content.pm.ApplicationInfo getApplicationInfo(String, int) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -11508,7 +11508,7 @@ package android.content.pm { 
    method public abstract android.graphics.drawable.Drawable getApplicationLogo(android.content.pm.ApplicationInfo);

    method public abstract android.graphics.drawable.Drawable getApplicationLogo(String) throws android.content.pm.PackageManager.NameNotFoundException;

    method @Nullable public abstract android.content.pm.ChangedPackages getChangedPackages(@IntRange(from=0) int);

    method public abstract int getComponentEnabledSetting(android.content.ComponentName);

    method public abstract int getComponentEnabledSetting(@NonNull android.content.ComponentName);

    method public abstract android.graphics.drawable.Drawable getDefaultActivityIcon();

    method public abstract android.graphics.drawable.Drawable getDrawable(String, @DrawableRes int, android.content.pm.ApplicationInfo);

    method public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
@@ -11574,8 +11574,8 @@ package android.content.pm { 
    method public abstract android.content.pm.ProviderInfo resolveContentProvider(String, int);

    method public abstract android.content.pm.ResolveInfo resolveService(android.content.Intent, int);

    method public abstract void setApplicationCategoryHint(@NonNull String, int);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setApplicationEnabledSetting(String, int, int);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setComponentEnabledSetting(android.content.ComponentName, int, int);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setApplicationEnabledSetting(@NonNull String, int, int);

    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setComponentEnabledSetting(@NonNull android.content.ComponentName, int, int);

    method public abstract void setInstallerPackageName(String, String);

    method public abstract void updateInstantAppCookie(@Nullable byte[]);

    method public abstract void verifyPendingInstall(int, int);

core/java/android/content/pm/PackageManager.java

+4 −4
Original line number Diff line number Diff line
@@ -5772,7 +5772,7 @@ public abstract class PackageManager { 
     */

    @RequiresPermission(value = android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE,

            conditional = true)

    public abstract void setComponentEnabledSetting(ComponentName componentName,

    public abstract void setComponentEnabledSetting(@NonNull ComponentName componentName,

            @EnabledState int newState, @EnabledFlags int flags);



    /**
@@ -5786,7 +5786,7 @@ public abstract class PackageManager { 
     * @return Returns the current enabled state for the component.

     */

    public abstract @EnabledState int getComponentEnabledSetting(

            ComponentName componentName);

            @NonNull ComponentName componentName);



    /**

     * Set the enabled setting for an application
@@ -5801,7 +5801,7 @@ public abstract class PackageManager { 
     */

    @RequiresPermission(value = android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE,

            conditional = true)

    public abstract void setApplicationEnabledSetting(String packageName,

    public abstract void setApplicationEnabledSetting(@NonNull String packageName,

            @EnabledState int newState, @EnabledFlags int flags);



    /**
@@ -5815,7 +5815,7 @@ public abstract class PackageManager { 
     * @return Returns the current enabled state for the application.

     * @throws IllegalArgumentException if the named package does not exist.

     */

    public abstract @EnabledState int getApplicationEnabledSetting(String packageName);

    public abstract @EnabledState int getApplicationEnabledSetting(@NonNull String packageName);



    /**

     * Flush the package restrictions for a given user to disk. This forces the package restrictions