summaryrefslogtreecommitdiffstats
path: root/core/java/android/app/ActivityThread.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-12-13 12:00:26 -0800
committerKenny Root <kroot@google.com>2013-12-13 13:40:30 -0800
commite6585b32ea586743258a5457e2184ffc087f2d2f (patch)
tree409f3c83c78e878a5efe2a0cc500659a27c77f38 /core/java/android/app/ActivityThread.java
parent584ace0d3f79ff43db9298798065dd5beaa66a45 (diff)
downloadframeworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.zip
frameworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.tar.gz
frameworks_base-e6585b32ea586743258a5457e2184ffc087f2d2f.tar.bz2
Use java.util.Objects instead on internal API
Not needed since java.util.Objects implements all the needed functionality. Change-Id: Icd31d49a9801d1705427f028e9ac927d58e7d34c
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
-rw-r--r--core/java/android/app/ActivityThread.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 65c40c1..d849965 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -93,7 +93,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;
@@ -109,6 +108,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;
@@ -222,7 +222,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;
}