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

Commit 8ef52dc3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove Parcelable's annotations usages in Telephony as they are not exposed."

parents 17f6ed8b 30d556a4

telephony/java/android/telephony/CallAttributes.java

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ import android.annotation.Nullable; 
import android.annotation.SystemApi;

import android.os.Parcel;

import android.os.Parcelable;



import android.telephony.Annotation.NetworkType;



import java.util.Objects;



/**
@@ -130,14 +130,14 @@ public final class CallAttributes implements Parcelable { 
    /**

     * {@link Parcelable#describeContents}

     */

    public @Parcelable.ContentsFlags int describeContents() {

    public int describeContents() {

        return 0;

    }



    /**

     * {@link Parcelable#writeToParcel}

     */

    public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) {

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeParcelable(mPreciseCallState, flags);

        dest.writeInt(mNetworkType);

        dest.writeParcelable(mCallQuality, flags);

telephony/java/android/telephony/CallQuality.java

+2 −2
Original line number Diff line number Diff line
@@ -400,14 +400,14 @@ public final class CallQuality implements Parcelable { 
    /**

     * {@link Parcelable#describeContents}

     */

    public @Parcelable.ContentsFlags int describeContents() {

    public int describeContents() {

        return 0;

    }



    /**

     * {@link Parcelable#writeToParcel}

     */

    public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) {

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(mDownlinkCallQualityLevel);

        dest.writeInt(mUplinkCallQualityLevel);

        dest.writeInt(mCallDuration);

telephony/java/android/telephony/PhoneCapability.java

+2 −2
Original line number Diff line number Diff line
@@ -429,14 +429,14 @@ public final class PhoneCapability implements Parcelable { 
    /**

     * {@link Parcelable#describeContents}

     */

    public @Parcelable.ContentsFlags int describeContents() {

    public int describeContents() {

        return 0;

    }



    /**

     * {@link Parcelable#writeToParcel}

     */

    public void writeToParcel(@NonNull Parcel dest, @Parcelable.WriteFlags int flags) {

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeInt(mUtranUeCategoryDl);

        dest.writeInt(mUtranUeCategoryUl);

        dest.writeInt(mEutranUeCategoryDl);

telephony/java/android/telephony/SimSlotCapability.java

+2 −2
Original line number Diff line number Diff line
@@ -105,14 +105,14 @@ public final class SimSlotCapability implements Parcelable { 
    /**

     * {@link Parcelable#describeContents}

     */

    public @ContentsFlags int describeContents() {

    public int describeContents() {

        return 0;

    }



    /**

     * {@link Parcelable#writeToParcel}

     */

    public void writeToParcel(@NonNull Parcel dest, @WriteFlags int flags) {

    public void writeToParcel(@NonNull Parcel dest, int flags) {

        dest.writeInt(mPhysicalSlotIndex);

        dest.writeInt(mSlotType);

    }