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

Commit 61aaf7ab authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Tweak generated ctor to allow building from Launcher" into sc-dev am:...

Merge "Tweak generated ctor to allow building from Launcher" into sc-dev am: 1edef64e am: 86268e37

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13428629

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83cab2343aa3387c9e0e27696d2f3f0462bcd619
parents 3d6d858c 86268e37
Loading
Loading
Loading
Loading
+2 −16
Original line number Diff line number Diff line
@@ -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;
        }