Merge "Pass Nullable to ActivityInterceptorInfo.Builder setters" (e0103a26) · Commits · e / os / android_frameworks_base

services/api/current.txt

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -299,11 +299,11 @@ package com.android.server.wm {
	public static final class ActivityInterceptorCallback.ActivityInterceptorInfo.Builder {		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);		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 build();
	method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setCallingFeatureId(@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(@NonNull 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(@NonNull android.app.ActivityOptions);		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(@NonNull Runnable);		method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setClearOptionsAnimationRunnable(@Nullable Runnable);
	method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setResolvedType(@NonNull String);		method @NonNull public com.android.server.wm.ActivityInterceptorCallback.ActivityInterceptorInfo.Builder setResolvedType(@Nullable String);
	}		}

	public class ActivityInterceptorCallbackRegistry {		public class ActivityInterceptorCallbackRegistry {

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -266,7 +266,7 @@ public interface ActivityInterceptorCallback {
	* @param resolvedType the resolved type.		* @param resolvedType the resolved type.
	*/		*/
	@NonNull		@NonNull
	public Builder setResolvedType(@NonNull String resolvedType) {		public Builder setResolvedType(@Nullable String resolvedType) {
	mResolvedType = resolvedType;		mResolvedType = resolvedType;
	return this;		return this;
	}		}
	@@ -276,7 +276,7 @@ public interface ActivityInterceptorCallback {
	* @param callingPackage the calling package.		* @param callingPackage the calling package.
	*/		*/
	@NonNull		@NonNull
	public Builder setCallingPackage(@NonNull String callingPackage) {		public Builder setCallingPackage(@Nullable String callingPackage) {
	mCallingPackage = callingPackage;		mCallingPackage = callingPackage;
	return this;		return this;
	}		}
	@@ -286,7 +286,7 @@ public interface ActivityInterceptorCallback {
	* @param callingFeatureId the calling feature id.		* @param callingFeatureId the calling feature id.
	*/		*/
	@NonNull		@NonNull
	public Builder setCallingFeatureId(@NonNull String callingFeatureId) {		public Builder setCallingFeatureId(@Nullable String callingFeatureId) {
	mCallingFeatureId = callingFeatureId;		mCallingFeatureId = callingFeatureId;
	return this;		return this;
	}		}
	@@ -296,7 +296,7 @@ public interface ActivityInterceptorCallback {
	* @param checkedOptions the {@link ActivityOptions}.		* @param checkedOptions the {@link ActivityOptions}.
	*/		*/
	@NonNull		@NonNull
	public Builder setCheckedOptions(@NonNull ActivityOptions checkedOptions) {		public Builder setCheckedOptions(@Nullable ActivityOptions checkedOptions) {
	mCheckedOptions = checkedOptions;		mCheckedOptions = checkedOptions;
	return this;		return this;
	}		}
	@@ -306,7 +306,7 @@ public interface ActivityInterceptorCallback {
	* @param clearOptionsAnimationRunnable the calling package.		* @param clearOptionsAnimationRunnable the calling package.
	*/		*/
	@NonNull		@NonNull
	public Builder setClearOptionsAnimationRunnable(@NonNull		public Builder setClearOptionsAnimationRunnable(@Nullable
	Runnable clearOptionsAnimationRunnable) {		Runnable clearOptionsAnimationRunnable) {
	mClearOptionsAnimation = clearOptionsAnimationRunnable;		mClearOptionsAnimation = clearOptionsAnimationRunnable;
	return this;		return this;