diff options
| author | Kenny Root <kroot@google.com> | 2013-12-13 15:59:51 -0800 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-12-13 15:59:51 -0800 |
| commit | 6a0db5990187a71427029fb0fd64394e849aa057 (patch) | |
| tree | 8dfd57e52d505162c96357350f95ec97932271de /core/java/android/app/ActivityThread.java | |
| parent | d08eadd287991ec18eafe620b24e2b1bf0ce1f2d (diff) | |
| parent | e0b14ea70b58cd04696fb37ffcf733eefc2dd717 (diff) | |
| download | frameworks_base-6a0db5990187a71427029fb0fd64394e849aa057.zip frameworks_base-6a0db5990187a71427029fb0fd64394e849aa057.tar.gz frameworks_base-6a0db5990187a71427029fb0fd64394e849aa057.tar.bz2 | |
resolved conflicts for merge of e0b14ea7 to master
Change-Id: Ie018d3e2eba1eb2d655c153880e1951b68c2bd51
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index d7a67f4..40899c0 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -97,7 +97,6 @@ import com.android.internal.os.BinderInternal; import com.android.internal.os.RuntimeInit; import com.android.internal.os.SamplingProfilerIntegration; import com.android.internal.util.FastPrintWriter; -import com.android.internal.util.Objects; import com.android.org.conscrypt.OpenSSLSocketImpl; import com.google.android.collect.Lists; @@ -113,6 +112,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.TimeZone; import java.util.regex.Pattern; @@ -226,7 +226,7 @@ public final class ActivityThread { public boolean equals(Object o) { if (o instanceof ProviderKey) { final ProviderKey other = (ProviderKey) o; - return Objects.equal(authority, other.authority) && userId == other.userId; + return Objects.equals(authority, other.authority) && userId == other.userId; } return false; } |