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

Commit 3b69cd31 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add NonNull annotation in ActivityManager."

parents 2fbf90c6 40285448

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -3947,7 +3947,7 @@ package android.app { 
    method public android.app.PendingIntent getRunningServiceControlPanel(android.content.ComponentName) throws java.lang.SecurityException;

    method @Deprecated public java.util.List<android.app.ActivityManager.RunningServiceInfo> getRunningServices(int) throws java.lang.SecurityException;

    method @Deprecated public java.util.List<android.app.ActivityManager.RunningTaskInfo> getRunningTasks(int) throws java.lang.SecurityException;

    method public boolean isActivityStartAllowedOnDisplay(android.content.Context, int, android.content.Intent);

    method public boolean isActivityStartAllowedOnDisplay(@NonNull android.content.Context, int, @NonNull android.content.Intent);

    method public boolean isBackgroundRestricted();

    method @Deprecated public boolean isInLockTaskMode();

    method public boolean isLowRamDevice();

core/java/android/app/ActivityManager.java

+2 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,8 @@ public class ActivityManager { 
     * @return {@code true} if a call to start an activity on the target display is allowed for the

     * provided context and no {@link SecurityException} will be thrown, {@code false} otherwise.

     */

    public boolean isActivityStartAllowedOnDisplay(Context context, int displayId, Intent intent) {

    public boolean isActivityStartAllowedOnDisplay(@NonNull Context context, int displayId,

            @NonNull Intent intent) {

        try {

            return getTaskService().isActivityStartAllowedOnDisplay(displayId, intent,

                    intent.resolveTypeIfNeeded(context.getContentResolver()), context.getUserId());