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

Commit 9b134911 authored by Adrian Roos's avatar Adrian Roos Committed by Automerger Merge Worker
Browse files

Merge "Remove dangling javadoc" am: 6d61168c 

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



Change-Id: I01d1573fd6e0e88e1f0513ee30346252386e3321
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 84737873 6d61168c

core/java/android/service/autofill/augmented/AugmentedAutofillService.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -332,7 +332,6 @@ public abstract class AugmentedAutofillService extends Service { 
    }

    }





    @Override

    @Override

    /** @hide */

    protected final void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

    protected final void dump(FileDescriptor fd, PrintWriter pw, String[] args) {

        pw.print("Service component: "); pw.println(

        pw.print("Service component: "); pw.println(

                ComponentName.flattenToShortString(mServiceComponentName));

                ComponentName.flattenToShortString(mServiceComponentName));

core/java/android/window/WindowContainerToken.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ public final class WindowContainerToken implements Parcelable { 
    }

    }





    @Override

    @Override

    /** @hide */

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

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

        dest.writeStrongBinder(mRealToken.asBinder());

        dest.writeStrongBinder(mRealToken.asBinder());

    }

    }
@@ -68,7 +67,6 @@ public final class WindowContainerToken implements Parcelable { 
            };

            };





    @Override

    @Override

    /** @hide */

    public int describeContents() {

    public int describeContents() {

        return 0;

        return 0;

    }

    }

core/java/android/window/WindowContainerTransaction.java

+0 −2
Original line number Original line Diff line number Diff line
@@ -865,7 +865,6 @@ public final class WindowContainerTransaction implements Parcelable { 
    }

    }





    @Override

    @Override

    /** @hide */

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

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

        dest.writeMap(mChanges);

        dest.writeMap(mChanges);

        dest.writeTypedList(mHierarchyOps);

        dest.writeTypedList(mHierarchyOps);
@@ -874,7 +873,6 @@ public final class WindowContainerTransaction implements Parcelable { 
    }

    }





    @Override

    @Override

    /** @hide */

    public int describeContents() {

    public int describeContents() {

        return 0;

        return 0;

    }

    }

media/java/android/media/AudioPresentation.java

+5 −6
Original line number Original line Diff line number Diff line
@@ -54,7 +54,11 @@ public final class AudioPresentation { 
    private final int mProgramId;

    private final int mProgramId;

    private final ULocale mLanguage;

    private final ULocale mLanguage;





    /** @hide */

    /**

     * The ContentClassifier int definitions represent the AudioPresentation content

     * classifier (as per TS 103 190-1 v1.2.1 4.3.3.8.1)

     * @hide

     */

    @IntDef(

    @IntDef(

        value = {

        value = {

        CONTENT_UNKNOWN,

        CONTENT_UNKNOWN,
@@ -67,11 +71,6 @@ public final class AudioPresentation { 
        CONTENT_EMERGENCY,

        CONTENT_EMERGENCY,

        CONTENT_VOICEOVER,

        CONTENT_VOICEOVER,

    })

    })



    /**

     * The ContentClassifier int definitions represent the AudioPresentation content

     * classifier (as per TS 103 190-1 v1.2.1 4.3.3.8.1)

    */

    @Retention(RetentionPolicy.SOURCE)

    @Retention(RetentionPolicy.SOURCE)

    public @interface ContentClassifier {}

    public @interface ContentClassifier {}

telephony/java/android/service/euicc/EuiccProfileInfo.java

+0 −3
Original line number Original line Diff line number Diff line
@@ -49,7 +49,6 @@ public final class EuiccProfileInfo implements Parcelable { 
            POLICY_RULE_DO_NOT_DELETE,

            POLICY_RULE_DO_NOT_DELETE,

            POLICY_RULE_DELETE_AFTER_DISABLING

            POLICY_RULE_DELETE_AFTER_DISABLING

    })

    })

    /** @hide */

    public @interface PolicyRule {}

    public @interface PolicyRule {}

    /** Once this profile is enabled, it cannot be disabled. */

    /** Once this profile is enabled, it cannot be disabled. */

    public static final int POLICY_RULE_DO_NOT_DISABLE = 1;

    public static final int POLICY_RULE_DO_NOT_DISABLE = 1;
@@ -66,7 +65,6 @@ public final class EuiccProfileInfo implements Parcelable { 
            PROFILE_CLASS_OPERATIONAL,

            PROFILE_CLASS_OPERATIONAL,

            PROFILE_CLASS_UNSET

            PROFILE_CLASS_UNSET

    })

    })

    /** @hide */

    public @interface ProfileClass {}

    public @interface ProfileClass {}

    /** Testing profiles */

    /** Testing profiles */

    public static final int PROFILE_CLASS_TESTING = 0;

    public static final int PROFILE_CLASS_TESTING = 0;
@@ -87,7 +85,6 @@ public final class EuiccProfileInfo implements Parcelable { 
            PROFILE_STATE_ENABLED,

            PROFILE_STATE_ENABLED,

            PROFILE_STATE_UNSET

            PROFILE_STATE_UNSET

    })

    })

    /** @hide */

    public @interface ProfileState {}

    public @interface ProfileState {}

    /** Disabled profiles */

    /** Disabled profiles */

    public static final int PROFILE_STATE_DISABLED = 0;

    public static final int PROFILE_STATE_DISABLED = 0;