Merge "Tweak generated ctor to allow building from Launcher" into sc-dev am: 1edef64e6d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia759bac2af2feb5230b69468d853a4dd4f29538d
This commit is contained in:
@@ -192,19 +192,6 @@ public class RemoteTransitionCompat implements Parcelable {
|
||||
// Settings > Editor > Code Style > Formatter Control
|
||||
//@formatter:off
|
||||
|
||||
|
||||
@DataClass.Generated.Member
|
||||
/* package-private */ RemoteTransitionCompat(
|
||||
@NonNull IRemoteTransition transition,
|
||||
@Nullable TransitionFilter filter) {
|
||||
this.mTransition = transition;
|
||||
com.android.internal.util.AnnotationValidations.validate(
|
||||
NonNull.class, null, mTransition);
|
||||
this.mFilter = filter;
|
||||
|
||||
// onConstructed(); // You can define this method to get a callback
|
||||
}
|
||||
|
||||
@DataClass.Generated.Member
|
||||
public @NonNull IRemoteTransition getTransition() {
|
||||
return mTransition;
|
||||
@@ -308,9 +295,8 @@ public class RemoteTransitionCompat implements Parcelable {
|
||||
if ((mBuilderFieldsSet & 0x2) == 0) {
|
||||
mFilter = null;
|
||||
}
|
||||
RemoteTransitionCompat o = new RemoteTransitionCompat(
|
||||
mTransition,
|
||||
mFilter);
|
||||
RemoteTransitionCompat o = new RemoteTransitionCompat(mTransition);
|
||||
o.mFilter = this.mFilter;
|
||||
return o;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user