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

Commit e0103a26 authored by Mohammed Rashidy's avatar Mohammed Rashidy Committed by Android (Google) Code Review
Browse files

Merge "Pass Nullable to ActivityInterceptorInfo.Builder setters"

parents a41f8c80 8465aed6

services/api/current.txt

+5 −5
Original line number Diff line number Diff line
@@ -299,11 +299,11 @@ package com.android.server.wm { 
  public static final class ActivityInterceptorCallback.ActivityInterceptorInfo.Builder {

    ctor public ActivityInterceptorCallback.ActivityInterceptorInfo.Builder(int, int, int, int, int, @NonNull android.content.Intent, @NonNull android.content.pm.ResolveInfo, @NonNull android.content.pm.ActivityInfo);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo build();

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCallingFeatureId(@NonNull String);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCallingPackage(@NonNull String);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCheckedOptions(@NonNull android.app.ActivityOptions);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setClearOptionsAnimationRunnable(@NonNull Runnable);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setResolvedType(@NonNull String);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCallingFeatureId(@Nullable String);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCallingPackage(@Nullable String);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCheckedOptions(@Nullable android.app.ActivityOptions);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setClearOptionsAnimationRunnable(@Nullable Runnable);

    method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setResolvedType(@Nullable String);

  }



  public class ActivityInterceptorCallbackRegistry {

services/core/java/com/android/server/wm/ActivityInterceptorCallback.java

+5 −5
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ public interface ActivityInterceptorCallback { 
             * @param resolvedType the resolved type.

             */

            @NonNull

            public Builder setResolvedType(@NonNull String resolvedType) {

            public Builder setResolvedType(@Nullable String resolvedType) {

                mResolvedType = resolvedType;

                return this;

            }
@@ -276,7 +276,7 @@ public interface ActivityInterceptorCallback { 
             * @param callingPackage the calling package.

             */

            @NonNull

            public Builder setCallingPackage(@NonNull String callingPackage) {

            public Builder setCallingPackage(@Nullable String callingPackage) {

                mCallingPackage = callingPackage;

                return this;

            }
@@ -286,7 +286,7 @@ public interface ActivityInterceptorCallback { 
             * @param callingFeatureId the calling feature id.

             */

            @NonNull

            public Builder setCallingFeatureId(@NonNull String callingFeatureId) {

            public Builder setCallingFeatureId(@Nullable String callingFeatureId) {

                mCallingFeatureId = callingFeatureId;

                return this;

            }
@@ -296,7 +296,7 @@ public interface ActivityInterceptorCallback { 
             * @param checkedOptions the {@link ActivityOptions}.

             */

            @NonNull

            public Builder setCheckedOptions(@NonNull ActivityOptions checkedOptions) {

            public Builder setCheckedOptions(@Nullable ActivityOptions checkedOptions) {

                mCheckedOptions = checkedOptions;

                return this;

            }
@@ -306,7 +306,7 @@ public interface ActivityInterceptorCallback { 
             * @param clearOptionsAnimationRunnable the calling package.

             */

            @NonNull

            public Builder setClearOptionsAnimationRunnable(@NonNull

            public Builder setClearOptionsAnimationRunnable(@Nullable

                    Runnable clearOptionsAnimationRunnable) {

                mClearOptionsAnimation = clearOptionsAnimationRunnable;

                return this;