Merge "Do not check package if package-equivalent components have set" (85ce7cb0) · Commits · e / os / android_frameworks_base

core/java/android/content/Intent.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10004,13 +10004,25 @@ public class Intent implements Parcelable, Cloneable {
	if (!Objects.equals(this.mData, other.mData)) return false;		if (!Objects.equals(this.mData, other.mData)) return false;
	if (!Objects.equals(this.mType, other.mType)) return false;		if (!Objects.equals(this.mType, other.mType)) return false;
	if (!Objects.equals(this.mIdentifier, other.mIdentifier)) return false;		if (!Objects.equals(this.mIdentifier, other.mIdentifier)) return false;
	if (!Objects.equals(this.mPackage, other.mPackage)) return false;		if (!(this.hasPackageEquivalentComponent() && other.hasPackageEquivalentComponent())
			&& !Objects.equals(this.mPackage, other.mPackage)) {
			return false;
			}
	if (!Objects.equals(this.mComponent, other.mComponent)) return false;		if (!Objects.equals(this.mComponent, other.mComponent)) return false;
	if (!Objects.equals(this.mCategories, other.mCategories)) return false;		if (!Objects.equals(this.mCategories, other.mCategories)) return false;

	return true;		return true;
	}		}

			/**
			* Return {@code true} if the component name is not null and is in the same package that this
			* intent limited to. otherwise return {@code false}.
			*/
			private boolean hasPackageEquivalentComponent() {
			return mComponent != null
			&& (mPackage == null \|\| mPackage.equals(mComponent.getPackageName()));
			}

	/**		/**
	* Generate hash code that matches semantics of filterEquals().		* Generate hash code that matches semantics of filterEquals().
	*		*