diff options
| -rw-r--r-- | services/api/current.txt | 10 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/ActivityInterceptorCallback.java | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/services/api/current.txt b/services/api/current.txt index 34dda9f198a3..5c7b9476b131 100644 --- a/services/api/current.txt +++ b/services/api/current.txt @@ -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 { diff --git a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java index ff1d44293dca..d844c6f17a5d 100644 --- a/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java +++ b/services/core/java/com/android/server/wm/ActivityInterceptorCallback.java @@ -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; |