Merge "docs: Add documentation for equals() method" into qt-dev am: 732a127636 am...

Change-Id: Ie77e185c38a1a5eda8efa73577d98babadb6e90d

diff --git a/core/java/android/content/ComponentName.java b/core/java/android/content/ComponentName.java
index 18147b5..2a9b491 100644 (file)
--- a/core/java/android/content/ComponentName.java
+++ b/core/java/android/content/ComponentName.java
@@ -305,6 +305,12 @@ public final class ComponentName implements Parcelable, Cloneable, Comparable<Co
         proto.end(token);
     }
 
+    /**
+     * {@inheritDoc}
+     *
+     * <p>Two components are considered to be equal if the packages in which they reside have the
+     * same name, and if the classes that implement each component also have the same name.
+     */
     @Override
     public boolean equals(Object obj) {
         try {