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

Commit 8cb1a417 authored by Eugene Susla's avatar Eugene Susla
Browse files

Add inheritance support for parcelable dataclasses 

We don't want to recommend this, but some legacy framework classes use
inheritance, and it's easy enough to support

Fixes: 142081378
Test: . frameworks/base/tests/Codegen/runTest.sh
Change-Id: Ifb7f34abf1dfb871ac01b9a9a38dfee144e5f49a
parent 2f495227

tests/Codegen/runTest.sh

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ else 
        header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleDataClass.java && \

        header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/SampleWithCustomBuilder.java && \

        header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/ParcelAllTheThingsDataClass.java && \

        header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java && \

        header_and_eval codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java && \

        cd $ANDROID_BUILD_TOP &&

        header_and_eval mmma -j16 frameworks/base/tests/Codegen && \

        header_and_eval adb install -r -t $ANDROID_PRODUCT_OUT/testcases/CodegenTests/arm64/CodegenTests.apk && \

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.codegentest;



parcelable HierrarchicalDataClassBase;

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.codegentest;



import android.os.Parcelable;



import com.android.internal.util.DataClass;



/**

 * @see HierrarchicalDataClassChild

 */

@DataClass(

        genConstructor = false,

        genSetters = true)

public class HierrarchicalDataClassBase implements Parcelable {



    private int mBaseData;







    // Code below generated by codegen v1.0.5.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    //

    // To regenerate run:

    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java





    @DataClass.Generated.Member

    public int getBaseData() {

        return mBaseData;

    }



    @DataClass.Generated.Member

    public HierrarchicalDataClassBase setBaseData(int value) {

        mBaseData = value;

        return this;

    }



    @Override

    @DataClass.Generated.Member

    public void writeToParcel(android.os.Parcel dest, int flags) {

        // You can override field parcelling by defining methods like:

        // void parcelFieldName(Parcel dest, int flags) { ... }



        dest.writeInt(mBaseData);

    }



    @Override

    @DataClass.Generated.Member

    public int describeContents() { return 0; }



    /** @hide */

    @SuppressWarnings({"unchecked", "RedundantCast"})

    @DataClass.Generated.Member

    protected HierrarchicalDataClassBase(android.os.Parcel in) {

        // You can override field unparcelling by defining methods like:

        // static FieldType unparcelFieldName(Parcel in) { ... }



        int baseData = in.readInt();



        this.mBaseData = baseData;



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public static final @android.annotation.NonNull Parcelable.Creator<HierrarchicalDataClassBase> CREATOR

            = new Parcelable.Creator<HierrarchicalDataClassBase>() {

        @Override

        public HierrarchicalDataClassBase[] newArray(int size) {

            return new HierrarchicalDataClassBase[size];

        }



        @Override

        public HierrarchicalDataClassBase createFromParcel(android.os.Parcel in) {

            return new HierrarchicalDataClassBase(in);

        }

    };



    @DataClass.Generated(

            time = 1570231100269L,

            codegenVersion = "1.0.5",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassBase.java",

            inputSignatures = "private  int mBaseData\nclass HierrarchicalDataClassBase extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genSetters=true)")

    @Deprecated

    private void __metadata() {}



}

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.codegentest;



parcelable HierrarchicalDataClassChild;

tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java

0 → 100644
+126 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2019 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.codegentest;



import android.annotation.NonNull;

import android.os.Parcelable;



import com.android.internal.util.DataClass;



/**

 * An example of data classes that extend one another.

 *

 * Note that some features like constructor generation might not work well due to lack of

 * information about the superclass when generating code for subclass.

 *

 * It is recommended to avoid inheritance in favor of composition for new data classes,

 * particularly parcelable ones.

 *

 * However for legacy classes or where inheritance is desired for allocation efficiency,

 * you can either use a technique from this example, opting for mutability/setters, or just write

 * constructors by hand.

 *

 * @see HierrarchicalDataClassBase

 */

@DataClass(

        genParcelable = true,

        genConstructor = false,

        genSetters = true)

public class HierrarchicalDataClassChild extends HierrarchicalDataClassBase {



    private @NonNull String mChildData;







    // Code below generated by codegen v1.0.5.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code

    //

    // To regenerate run:

    // $ codegen $ANDROID_BUILD_TOP/frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java





    @DataClass.Generated.Member

    public @NonNull String getChildData() {

        return mChildData;

    }



    @DataClass.Generated.Member

    public HierrarchicalDataClassChild setChildData(@NonNull String value) {

        mChildData = value;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, mChildData);

        return this;

    }



    @Override

    @DataClass.Generated.Member

    public void writeToParcel(android.os.Parcel dest, int flags) {

        // You can override field parcelling by defining methods like:

        // void parcelFieldName(Parcel dest, int flags) { ... }



        super.writeToParcel(dest, flags);



        dest.writeString(mChildData);

    }



    @Override

    @DataClass.Generated.Member

    public int describeContents() { return 0; }



    /** @hide */

    @SuppressWarnings({"unchecked", "RedundantCast"})

    @DataClass.Generated.Member

    protected HierrarchicalDataClassChild(android.os.Parcel in) {

        // You can override field unparcelling by defining methods like:

        // static FieldType unparcelFieldName(Parcel in) { ... }



        super(in);



        String childData = in.readString();



        this.mChildData = childData;

        com.android.internal.util.AnnotationValidations.validate(

                NonNull.class, null, mChildData);



        // onConstructed(); // You can define this method to get a callback

    }



    @DataClass.Generated.Member

    public static final @NonNull Parcelable.Creator<HierrarchicalDataClassChild> CREATOR

            = new Parcelable.Creator<HierrarchicalDataClassChild>() {

        @Override

        public HierrarchicalDataClassChild[] newArray(int size) {

            return new HierrarchicalDataClassChild[size];

        }



        @Override

        public HierrarchicalDataClassChild createFromParcel(android.os.Parcel in) {

            return new HierrarchicalDataClassChild(in);

        }

    };



    @DataClass.Generated(

            time = 1570231101208L,

            codegenVersion = "1.0.5",

            sourceFile = "frameworks/base/tests/Codegen/src/com/android/codegentest/HierrarchicalDataClassChild.java",

            inputSignatures = "private @android.annotation.NonNull java.lang.String mChildData\nclass HierrarchicalDataClassChild extends com.android.codegentest.HierrarchicalDataClassBase implements []\n@com.android.internal.util.DataClass(genParcelable=true, genConstructor=false, genSetters=true)")

    @Deprecated

    private void __metadata() {}



}