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

Commit f7f45e35 authored by Adam He's avatar Adam He Committed by Automerger Merge Worker
Browse files

Merge "Make getText() nullable and return null." into sc-dev am: af6aa6ff 

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

Change-Id: I6d54d25388e150fc78d38e5778311f422be64367
parents 4d003eaf af6aa6ff

core/api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -52902,7 +52902,7 @@ package android.view.translation { 
  public final class TranslationRequestValue implements android.os.Parcelable {

    method public int describeContents();

    method @NonNull public static android.view.translation.TranslationRequestValue forText(@NonNull CharSequence);

    method @NonNull public CharSequence getText();

    method @Nullable public CharSequence getText();

    method public void writeToParcel(@NonNull android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.view.translation.TranslationRequestValue> CREATOR;

  }

core/java/android/view/translation/TranslationRequestValue.java

+9 −14
Original line number Diff line number Diff line
@@ -46,22 +46,17 @@ public final class TranslationRequestValue implements Parcelable { 
    }



    /**

     * @return the text value as a {@link CharSequence}.

     *

     * @throws IllegalStateException if the format of this {@link TranslationRequestValue} is not a

     * text value.

     * @return the text value as a {@link CharSequence} or {@code null} if the value is not of type

     * text.

     */

    @NonNull

    @Nullable

    public CharSequence getText() {

        if (mText == null) {

            throw new IllegalStateException("Value is not of type text");

        }

        return mText;

    }







    // Code below generated by codegen v1.0.22.

    // Code below generated by codegen v1.0.23.

    //

    // DO NOT MODIFY!

    // CHECKSTYLE:OFF Generated code
@@ -111,7 +106,7 @@ public final class TranslationRequestValue implements Parcelable { 
        TranslationRequestValue that = (TranslationRequestValue) o;

        //noinspection PointlessBooleanExpression

        return true

                && java.util.Objects.equals(mText, that.mText);

                && Objects.equals(mText, that.mText);

    }



    @Override
@@ -121,7 +116,7 @@ public final class TranslationRequestValue implements Parcelable { 
        // int fieldNameHashCode() { ... }



        int _hash = 1;

        _hash = 31 * _hash + java.util.Objects.hashCode(mText);

        _hash = 31 * _hash + Objects.hashCode(mText);

        return _hash;

    }
@@ -171,10 +166,10 @@ public final class TranslationRequestValue implements Parcelable { 
    };



    @DataClass.Generated(

            time = 1613687761635L,

            codegenVersion = "1.0.22",

            time = 1620259864154L,

            codegenVersion = "1.0.23",

            sourceFile = "frameworks/base/core/java/android/view/translation/TranslationRequestValue.java",

            inputSignatures = "private final @android.annotation.Nullable java.lang.CharSequence mText\npublic static @android.annotation.NonNull android.view.translation.TranslationRequestValue forText(java.lang.CharSequence)\npublic @android.annotation.NonNull java.lang.CharSequence getText()\nclass TranslationRequestValue extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genToString=true, genEqualsHashCode=true)")

            inputSignatures = "private final @android.annotation.Nullable java.lang.CharSequence mText\npublic static @android.annotation.NonNull android.view.translation.TranslationRequestValue forText(java.lang.CharSequence)\npublic @android.annotation.Nullable java.lang.CharSequence getText()\nclass TranslationRequestValue extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genHiddenConstructor=true, genToString=true, genEqualsHashCode=true)")

    @Deprecated

    private void __metadata() {}